diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
| commit | ba2dacab305c598cd4c34a604f8e276bf5bab5ff (patch) | |
| tree | 78670a0139bf4d5ace617b29b7eba82bbc74d602 /arch/sparc64/prom | |
| parent | b77bf69998121e689c5e86cc5630d39a0a9ee6ca (diff) | |
Merge with Linux 2.3.99-pre7 and various other bits.
Diffstat (limited to 'arch/sparc64/prom')
| -rw-r--r-- | arch/sparc64/prom/misc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/sparc64/prom/misc.c b/arch/sparc64/prom/misc.c index 50b287080..90c77ea74 100644 --- a/arch/sparc64/prom/misc.c +++ b/arch/sparc64/prom/misc.c @@ -39,7 +39,7 @@ extern void (*prom_palette)(int); extern int serial_console; #endif -#ifdef __SMP__ +#ifdef CONFIG_SMP extern void smp_capture(void); extern void smp_release(void); #endif @@ -63,7 +63,7 @@ prom_cmdline(void) * So in order for everything to work reliably, even * on SMP, we need to drop the IRQ locks we hold. */ -#ifdef __SMP__ +#ifdef CONFIG_SMP irq_exit(smp_processor_id(), 0); smp_capture(); #else @@ -72,7 +72,7 @@ prom_cmdline(void) p1275_cmd ("enter", P1275_INOUT(0,0)); -#ifdef __SMP__ +#ifdef CONFIG_SMP smp_release(); irq_enter(smp_processor_id(), 0); spin_unlock_wait(&__br_write_locks[BR_GLOBALIRQ_LOCK].lock); @@ -88,7 +88,7 @@ prom_cmdline(void) __restore_flags(flags); } -#ifdef __SMP__ +#ifdef CONFIG_SMP extern void smp_promstop_others(void); #endif @@ -98,7 +98,7 @@ extern void smp_promstop_others(void); void prom_halt(void) { -#ifdef __SMP__ +#ifdef CONFIG_SMP smp_promstop_others(); udelay(8000); #endif @@ -328,7 +328,7 @@ int prom_wakeupsystem(void) return p1275_cmd("SUNW,wakeup-system", P1275_INOUT(0, 1)); } -#ifdef __SMP__ +#ifdef CONFIG_SMP void prom_startcpu(int cpunode, unsigned long pc, unsigned long o0) { p1275_cmd("SUNW,start-cpu", P1275_INOUT(3, 0), cpunode, pc, o0); |