diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-06-30 00:21:34 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-06-30 00:21:34 +0000 |
| commit | 3917ac5846dd0f9ad1238166f90caab9912052e6 (patch) | |
| tree | 1c298935def4f29edb39192365a65d73de999155 /include/asm-arm | |
| parent | af2f803c8b2d469fe38e4a7ce952658dfcb6681a (diff) | |
o Merge with Linux 2.1.100.
o Cleanup the machine dependencies of floppy and rtc. The driver for
the Dallas thingy in the Indy is still missing.
o Handle allocation of zero'd pages correct for R4000SC / R4400SC.
o Page colouring shit to match the virtual and physical colour of all
mapped pages. This tends to produce extreme fragmentation problems,
so it's deactivated for now. Users of R4000SC / R4400SC may re-enable
the code in arch/mips/mm/init.c by removing the definition of
CONF_GIVE_A_SHIT_ABOUT_COLOURS. Should get them somewhat further -
but don't shake to hard ...
o Fixed ptrace(2)-ing of syscalls, strace is now working again.
o Fix the interrupt forwarding from the keyboard driver to the psaux
driver, PS/2 mice are now working on the Indy. The fix is somewhat
broken as it prevents generic kernels for Indy and machines which handle
things different.
o Things I can't remember.
Diffstat (limited to 'include/asm-arm')
| -rw-r--r-- | include/asm-arm/floppy.h | 1 | ||||
| -rw-r--r-- | include/asm-arm/ide.h | 2 | ||||
| -rw-r--r-- | include/asm-arm/mmu_context.h | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-arm/floppy.h b/include/asm-arm/floppy.h index 0f3857962..e753d579b 100644 --- a/include/asm-arm/floppy.h +++ b/include/asm-arm/floppy.h @@ -25,7 +25,6 @@ #define fd_set_dma_mode(mode) set_dma_mode(FLOPPY_DMA, (mode)) #define fd_set_dma_addr(addr) set_dma_addr(FLOPPY_DMA, virt_to_bus((addr))) #define fd_set_dma_count(len) set_dma_count(FLOPPY_DMA, (len)) -#define fd_cacheflush(addr,sz) /* Floppy_selects is the list of DOR's to select drive fd * diff --git a/include/asm-arm/ide.h b/include/asm-arm/ide.h index 3710c2911..2ead7b36a 100644 --- a/include/asm-arm/ide.h +++ b/include/asm-arm/ide.h @@ -19,7 +19,7 @@ typedef unsigned long ide_ioreg_t; #define MAX_HWIFS 4 #endif -#define ide_sti() sti() +#define ide__sti() __sti() #include <asm/arch/ide.h> diff --git a/include/asm-arm/mmu_context.h b/include/asm-arm/mmu_context.h index 7325fbaa4..f6e4c3e33 100644 --- a/include/asm-arm/mmu_context.h +++ b/include/asm-arm/mmu_context.h @@ -13,5 +13,6 @@ #define init_new_context(mm) do { } while(0) #define destroy_context(mm) do { } while(0) +#define activate_context(tsk) do { } while(0) #endif |