diff options
| author | Alex deVries <Alex.deVries@windriver.com> | 1999-02-06 03:57:37 +0000 |
|---|---|---|
| committer | Alex deVries <Alex.deVries@windriver.com> | 1999-02-06 03:57:37 +0000 |
| commit | 2f7a646bdb098918bf1d541b2fe63c7a9a89192f (patch) | |
| tree | b401efc2464f8cced8c885f8e08cf7477b2559e1 /arch/mips/kernel | |
| parent | 7612165ef628025903698bcb33b7140c576f2963 (diff) | |
- fixed compiling in of ramdisks; we don't have the kernel segment defining initrd offset, etc.
- a couple of HAL related changes to make it build better
- the start of making newport graphics a module; currently this breaks as a
module, but works okay built into the kernel.
- Alex
Diffstat (limited to 'arch/mips/kernel')
| -rw-r--r-- | arch/mips/kernel/mips_ksyms.c | 4 | ||||
| -rw-r--r-- | arch/mips/kernel/setup.c | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/arch/mips/kernel/mips_ksyms.c b/arch/mips/kernel/mips_ksyms.c index dc028ade7..a07a13b37 100644 --- a/arch/mips/kernel/mips_ksyms.c +++ b/arch/mips/kernel/mips_ksyms.c @@ -1,4 +1,4 @@ -/* $Id: mips_ksyms.c,v 1.10 1999/01/03 17:50:51 ralf Exp $ +/* $Id: mips_ksyms.c,v 1.11 1999/01/27 19:24:54 ulfc Exp $ * * Export MIPS-specific functions needed for loadable modules. * @@ -25,6 +25,7 @@ #include <asm/sgihpc.h> #include <asm/softirq.h> #include <asm/uaccess.h> +#include <asm/indy_pbus.h> extern void *__bzero(void *__s, size_t __count); extern long __strncpy_from_user_nocheck_asm(char *__to, @@ -119,3 +120,4 @@ EXPORT_SYMBOL(__compute_return_epc); EXPORT_SYMBOL(register_fpe); EXPORT_SYMBOL(unregister_fpe); #endif + diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index dc9e51d72..bd7d9fe24 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -1,4 +1,4 @@ -/* $Id: setup.c,v 1.10 1998/10/18 13:25:32 tsbogend Exp $ +/* $Id: setup.c,v 1.11 1999/01/03 17:50:52 ralf Exp $ * * This file is subject to the terms and conditions of the GNU General Public * License. See the file "COPYING" in the main directory of this archive @@ -211,12 +211,6 @@ __initfunc(void setup_arch(char **cmdline_p, memory_end -= 128; memory_end &= PAGE_MASK; -#ifdef CONFIG_BLK_DEV_RAM - rd_image_start = RAMDISK_FLAGS & RAMDISK_IMAGE_START_MASK; - rd_prompt = ((RAMDISK_FLAGS & RAMDISK_PROMPT_FLAG) != 0); - rd_doload = ((RAMDISK_FLAGS & RAMDISK_LOAD_FLAG) != 0); -#endif - strncpy (command_line, arcs_cmdline, CL_SIZE); memcpy(saved_command_line, command_line, CL_SIZE); saved_command_line[CL_SIZE-1] = '\0'; |