diff options
Diffstat (limited to 'arch/sparc/kernel')
-rw-r--r-- | arch/sparc/kernel/process.c | 6 | ||||
-rw-r--r-- | arch/sparc/kernel/setup.c | 4 |
2 files changed, 0 insertions, 10 deletions
diff --git a/arch/sparc/kernel/process.c b/arch/sparc/kernel/process.c index 19186ce8850d..0bd69d0b5cd7 100644 --- a/arch/sparc/kernel/process.c +++ b/arch/sparc/kernel/process.c | |||
@@ -141,16 +141,12 @@ void cpu_idle(void) | |||
141 | 141 | ||
142 | extern char reboot_command []; | 142 | extern char reboot_command []; |
143 | 143 | ||
144 | extern void (*prom_palette)(int); | ||
145 | |||
146 | /* XXX cli/sti -> local_irq_xxx here, check this works once SMP is fixed. */ | 144 | /* XXX cli/sti -> local_irq_xxx here, check this works once SMP is fixed. */ |
147 | void machine_halt(void) | 145 | void machine_halt(void) |
148 | { | 146 | { |
149 | local_irq_enable(); | 147 | local_irq_enable(); |
150 | mdelay(8); | 148 | mdelay(8); |
151 | local_irq_disable(); | 149 | local_irq_disable(); |
152 | if (prom_palette) | ||
153 | prom_palette (1); | ||
154 | prom_halt(); | 150 | prom_halt(); |
155 | panic("Halt failed!"); | 151 | panic("Halt failed!"); |
156 | } | 152 | } |
@@ -165,8 +161,6 @@ void machine_restart(char * cmd) | |||
165 | 161 | ||
166 | p = strchr (reboot_command, '\n'); | 162 | p = strchr (reboot_command, '\n'); |
167 | if (p) *p = 0; | 163 | if (p) *p = 0; |
168 | if (prom_palette) | ||
169 | prom_palette (1); | ||
170 | if (cmd) | 164 | if (cmd) |
171 | prom_reboot(cmd); | 165 | prom_reboot(cmd); |
172 | if (*reboot_command) | 166 | if (*reboot_command) |
diff --git a/arch/sparc/kernel/setup.c b/arch/sparc/kernel/setup.c index 3cf78f160846..3c13137685da 100644 --- a/arch/sparc/kernel/setup.c +++ b/arch/sparc/kernel/setup.c | |||
@@ -65,7 +65,6 @@ struct screen_info screen_info = { | |||
65 | */ | 65 | */ |
66 | 66 | ||
67 | extern unsigned long trapbase; | 67 | extern unsigned long trapbase; |
68 | void (*prom_palette)(int); | ||
69 | 68 | ||
70 | /* Pretty sick eh? */ | 69 | /* Pretty sick eh? */ |
71 | void prom_sync_me(void) | 70 | void prom_sync_me(void) |
@@ -80,8 +79,6 @@ void prom_sync_me(void) | |||
80 | "nop\n\t" | 79 | "nop\n\t" |
81 | "nop\n\t" : : "r" (&trapbase)); | 80 | "nop\n\t" : : "r" (&trapbase)); |
82 | 81 | ||
83 | if (prom_palette) | ||
84 | prom_palette(1); | ||
85 | prom_printf("PROM SYNC COMMAND...\n"); | 82 | prom_printf("PROM SYNC COMMAND...\n"); |
86 | show_free_areas(); | 83 | show_free_areas(); |
87 | if(current->pid != 0) { | 84 | if(current->pid != 0) { |
@@ -191,7 +188,6 @@ extern int prom_probe_memory(void); | |||
191 | extern void sun4c_probe_vac(void); | 188 | extern void sun4c_probe_vac(void); |
192 | extern char cputypval; | 189 | extern char cputypval; |
193 | extern unsigned long start, end; | 190 | extern unsigned long start, end; |
194 | extern void panic_setup(char *, int *); | ||
195 | 191 | ||
196 | extern unsigned short root_flags; | 192 | extern unsigned short root_flags; |
197 | extern unsigned short root_dev; | 193 | extern unsigned short root_dev; |