diff options
Diffstat (limited to 'arch/sparc/prom/misc_32.c')
-rw-r--r-- | arch/sparc/prom/misc_32.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/sparc/prom/misc_32.c b/arch/sparc/prom/misc_32.c index 4d61c540bb3d..677b6a10fbde 100644 --- a/arch/sparc/prom/misc_32.c +++ b/arch/sparc/prom/misc_32.c | |||
@@ -54,15 +54,11 @@ EXPORT_SYMBOL(prom_feval); | |||
54 | void | 54 | void |
55 | prom_cmdline(void) | 55 | prom_cmdline(void) |
56 | { | 56 | { |
57 | extern void install_obp_ticker(void); | ||
58 | extern void install_linux_ticker(void); | ||
59 | unsigned long flags; | 57 | unsigned long flags; |
60 | 58 | ||
61 | spin_lock_irqsave(&prom_lock, flags); | 59 | spin_lock_irqsave(&prom_lock, flags); |
62 | install_obp_ticker(); | ||
63 | (*(romvec->pv_abort))(); | 60 | (*(romvec->pv_abort))(); |
64 | restore_current(); | 61 | restore_current(); |
65 | install_linux_ticker(); | ||
66 | spin_unlock_irqrestore(&prom_lock, flags); | 62 | spin_unlock_irqrestore(&prom_lock, flags); |
67 | set_auxio(AUXIO_LED, 0); | 63 | set_auxio(AUXIO_LED, 0); |
68 | } | 64 | } |
@@ -70,7 +66,7 @@ prom_cmdline(void) | |||
70 | /* Drop into the prom, but completely terminate the program. | 66 | /* Drop into the prom, but completely terminate the program. |
71 | * No chance of continuing. | 67 | * No chance of continuing. |
72 | */ | 68 | */ |
73 | void | 69 | void __noreturn |
74 | prom_halt(void) | 70 | prom_halt(void) |
75 | { | 71 | { |
76 | unsigned long flags; | 72 | unsigned long flags; |