diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-18 17:14:17 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-18 17:14:17 -0400 |
| commit | 28af493cd7b89cba7e3ee534079cf4f41bb4b4f9 (patch) | |
| tree | ea27df5ab7b728496a15602e0a7da74ff188378f /arch/sparc64/prom | |
| parent | 74cfe03f80adc320bde4dd37616354aefe2271aa (diff) | |
| parent | 39ca371c45b04cd50d0974030ae051906fc516b6 (diff) | |
| download | linux-rt-28af493cd7b89cba7e3ee534079cf4f41bb4b4f9.tar.gz | |
Merge branch 'master'
Diffstat (limited to 'arch/sparc64/prom')
| -rw-r--r-- | arch/sparc64/prom/misc.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/sparc64/prom/misc.c b/arch/sparc64/prom/misc.c index 9b895faf077b..87f5cfce23bb 100644 --- a/arch/sparc64/prom/misc.c +++ b/arch/sparc64/prom/misc.c @@ -68,19 +68,11 @@ void prom_cmdline(void) local_irq_restore(flags); } -#ifdef CONFIG_SMP -extern void smp_promstop_others(void); -#endif - /* Drop into the prom, but completely terminate the program. * No chance of continuing. */ void prom_halt(void) { -#ifdef CONFIG_SMP - smp_promstop_others(); - udelay(8000); -#endif again: p1275_cmd("exit", P1275_INOUT(0, 0)); goto again; /* PROM is out to get me -DaveM */ @@ -88,10 +80,6 @@ again: void prom_halt_power_off(void) { -#ifdef CONFIG_SMP - smp_promstop_others(); - udelay(8000); -#endif p1275_cmd("SUNW,power-off", P1275_INOUT(0, 0)); /* if nothing else helps, we just halt */ |