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/sgi/kernel/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/sgi/kernel/setup.c')
| -rw-r--r-- | arch/mips/sgi/kernel/setup.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/arch/mips/sgi/kernel/setup.c b/arch/mips/sgi/kernel/setup.c index 5107edb6f..9699f812c 100644 --- a/arch/mips/sgi/kernel/setup.c +++ b/arch/mips/sgi/kernel/setup.c @@ -1,16 +1,19 @@ -/* $Id: setup.c,v 1.8 1998/05/06 02:46:46 ralf Exp $ +/* $Id: setup.c,v 1.9 1998/05/07 02:57:21 ralf Exp $ * * setup.c: SGI specific setup, including init of the feature struct. * * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) + * Copyright (C) 1997, 1998 Ralf Baechle (ralf@gnu.org) */ #include <linux/init.h> #include <linux/kernel.h> #include <linux/sched.h> +#include <linux/mc146818rtc.h> #include <asm/addrspace.h> #include <asm/bcache.h> #include <asm/keyboard.h> +#include <asm/irq.h> #include <asm/reboot.h> #include <asm/vector.h> #include <asm/sgialib.h> @@ -25,8 +28,7 @@ extern void sgi_machine_restart(char *command); extern void sgi_machine_halt(void); extern void sgi_machine_power_off(void); -struct feature sgi_feature = { -}; +extern struct rtc_ops indy_rtc_ops; static volatile struct hpc_keyb *sgi_kh = (struct hpc_keyb *) (KSEG1 + 0x1fbd9800 + 64); @@ -80,7 +82,6 @@ __initfunc(void sgi_setup(void)) char *ctype; irq_setup = sgi_irq_setup; - feature = &sgi_feature; keyboard_setup = sgi_keyboard_setup; _machine_restart = sgi_machine_restart; @@ -117,4 +118,6 @@ __initfunc(void sgi_setup(void)) prom_imode(); } } + + rtc_ops = &indy_rtc_ops; } |