diff options
| author | Harald Koerfgen <hkoerfg@web.de> | 1999-09-18 20:48:03 +0000 |
|---|---|---|
| committer | Harald Koerfgen <hkoerfg@web.de> | 1999-09-18 20:48:03 +0000 |
| commit | bb722553b5f6467eb4acbc3afa2bf4cc7bd60474 (patch) | |
| tree | 6b3ab5449aece7ba73d11235fe6c452ca27d446b /arch | |
| parent | 2eea98631f146d92aa39a39e23f5ac02ca34d20b (diff) | |
o made CVS compile again for R5000
o dz fixes by David Airlie
o small zs fix (init is fast again)
o #ifdef in softirq.h fixed
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/mips/kernel/setup.c | 4 | ||||
| -rw-r--r-- | arch/mips/mm/Makefile | 8 | ||||
| -rw-r--r-- | arch/mips/mm/loadmmu.c | 8 |
3 files changed, 15 insertions, 5 deletions
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index 89e4f7b37..b8a2b4303 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -1,4 +1,4 @@ -/* $Id: setup.c,v 1.16 1999/06/17 13:25:47 ralf Exp $ +/* $Id: setup.c,v 1.17 1999/08/20 21:59:02 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 @@ -76,7 +76,7 @@ int EISA_bus = 0; * information is being use to continue the screen output just below * the BIOS printed text and with the same text resolution. */ -struct screen_info screen_info = DEFAULT_SCREEN_INFO; +struct screen_info screen_info; #ifdef CONFIG_BLK_DEV_FD extern struct fd_ops no_fd_ops; diff --git a/arch/mips/mm/Makefile b/arch/mips/mm/Makefile index 946b73ced..f0d34b0d6 100644 --- a/arch/mips/mm/Makefile +++ b/arch/mips/mm/Makefile @@ -22,6 +22,14 @@ ifdef CONFIG_CPU_R4X00 O_OBJS += r4xx0.o endif +ifdef CONFIG_CPU_R5000 +O_OBJS += r4xx0.o +endif + +ifdef CONFIG_CPU_NEVADA +O_OBJS += r4xx0.o +endif + ifdef CONFIG_CPU_R6000 O_OBJS += r6000.o endif diff --git a/arch/mips/mm/loadmmu.c b/arch/mips/mm/loadmmu.c index cd6a884c7..f41eab442 100644 --- a/arch/mips/mm/loadmmu.c +++ b/arch/mips/mm/loadmmu.c @@ -3,7 +3,7 @@ * * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) * - * $Id: loadmmu.c,v 1.10 1999/06/17 13:25:51 ralf Exp $ + * $Id: loadmmu.c,v 1.11 1999/08/09 19:43:16 harald Exp $ */ #include <linux/init.h> #include <linux/kernel.h> @@ -37,7 +37,8 @@ void (*dma_cache_inv)(unsigned long start, unsigned long size); #ifdef CONFIG_CPU_R3000 extern void ld_mmu_r2300(void); #endif -#if defined(CONFIG_CPU_R4X00) || defined(CONFIG_CPU_R4300) +#if defined(CONFIG_CPU_R4X00) || defined(CONFIG_CPU_R4300) || \ + defined(CONFIG_CPU_R5000) || defined(CONFIG_CPU_NEVADA) extern void ld_mmu_r4xx0(void); #endif #ifdef CONFIG_CPU_R6000 @@ -62,7 +63,8 @@ __initfunc(void loadmmu(void)) break; #endif -#if defined(CONFIG_CPU_R4X00) || defined(CONFIG_CPU_R4300) +#if defined(CONFIG_CPU_R4X00) || defined(CONFIG_CPU_R4300) || \ + defined(CONFIG_CPU_R5000) || defined(CONFIG_CPU_NEVADA) case CPU_R4000PC: case CPU_R4000SC: case CPU_R4000MC: |