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 /arch/mips/sni/setup.c | |
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 'arch/mips/sni/setup.c')
-rw-r--r-- | arch/mips/sni/setup.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/mips/sni/setup.c b/arch/mips/sni/setup.c index d2b0109e7..60b51a5d4 100644 --- a/arch/mips/sni/setup.c +++ b/arch/mips/sni/setup.c @@ -1,4 +1,4 @@ -/* $Id: setup.c,v 1.6 1998/05/04 09:12:58 ralf Exp $ +/* $Id: setup.c,v 1.7 1998/05/07 23:44:02 ralf Exp $ * * Setup pointers to hardware dependant routines. * @@ -26,7 +26,6 @@ #include <asm/processor.h> #include <asm/reboot.h> #include <asm/sni.h> -#include <asm/vector.h> #include <asm/pci.h> /* @@ -40,8 +39,6 @@ static void no_action(int cpl, void *dev_id, struct pt_regs *regs) { } static struct irqaction irq2 = { no_action, 0, 0, "cascade", NULL, NULL}; extern asmlinkage void sni_rm200_pci_handle_int(void); -extern asmlinkage void sni_fd_cacheflush(const void *addr, size_t size); -extern struct feature sni_rm200_pci_feature; extern void sni_rm200_keyboard_setup(void); extern void sni_machine_restart(char *command); @@ -49,6 +46,7 @@ extern void sni_machine_halt(void); extern void sni_machine_power_off(void); extern struct ide_ops std_ide_ops; +extern struct rtc_ops std_rtc_ops; __initfunc(static void sni_irq_setup(void)) { @@ -133,8 +131,6 @@ __initfunc(void sni_rm200_pci_setup(void)) sni_pcimt_sc_init(); irq_setup = sni_irq_setup; - fd_cacheflush = sni_fd_cacheflush; // Will go away - feature = &sni_rm200_pci_feature; mips_io_port_base = SNI_PORT_BASE; keyboard_setup = sni_rm200_keyboard_setup; @@ -165,7 +161,10 @@ __initfunc(void sni_rm200_pci_setup(void)) */ request_region(0xcfc,0x04,"PCI config data"); pci_ops = &sni_pci_ops; + #ifdef CONFIG_BLK_DEV_IDE ide_ops = &std_ide_ops; #endif + + rtc_ops = &std_rtc_ops; } |