diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-04-28 01:09:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-04-28 01:09:25 +0000 |
| commit | b9ba7aeb165cffecdffb60aec8c3fa8d590d9ca9 (patch) | |
| tree | 42d07b0c7246ae2536a702e7c5de9e2732341116 /arch/ppc/kernel/gemini_prom.S | |
| parent | 7406b0a326f2d70ade2671c37d1beef62249db97 (diff) | |
Merge with 2.3.99-pre6.
Diffstat (limited to 'arch/ppc/kernel/gemini_prom.S')
| -rw-r--r-- | arch/ppc/kernel/gemini_prom.S | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/ppc/kernel/gemini_prom.S b/arch/ppc/kernel/gemini_prom.S index f91e992f4..0904bb0eb 100644 --- a/arch/ppc/kernel/gemini_prom.S +++ b/arch/ppc/kernel/gemini_prom.S @@ -10,6 +10,7 @@ #include "ppc_asm.tmpl" #include "ppc_defs.h" +#include <linux/config.h> #include <asm/processor.h> #include <asm/page.h> #include <asm/gemini.h> @@ -25,7 +26,7 @@ _GLOBAL(prom_init) _GLOBAL(gemini_prom_init) -#ifdef __SMP__ +#ifdef CONFIG_SMP /* Since the MMU's on, get stuff in rom space that we'll need */ lis r4,GEMINI_CPUSTAT@h ori r4,r4,GEMINI_CPUSTAT@l @@ -74,14 +75,14 @@ prom_no_mmu: addi r3,r3,1 bdnz 3b -#ifdef __SMP__ +#ifdef CONFIG_SMP /* The 750 book (and Mot/IBM support) says that this will "assist" snooping when in SMP. Not sure yet whether this should stay or leave... */ mfspr r4,HID0 ori r4,r4,HID0_ABE mtspr HID0,r4 sync -#endif /* __SMP__ */ +#endif /* CONFIG_SMP */ blr /* apparently, SMon doesn't pay attention to HID0[SRST]. Disable the MMU and |