diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-19 07:53:28 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-19 07:53:28 -0800 |
| commit | b69409279c4c960fcd1575bcf80f2a0ca414ca93 (patch) | |
| tree | da8105a20ccc08caa033a9b40da7111e1de902d7 /arch/sparc/kernel | |
| parent | 07ce198a1eb3431d04a6d59ea9fb7b71f21e33b1 (diff) | |
| parent | f6d091e05199e67ba79c3ea29faa5c3b51d5daf4 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Add regs_return_value().
[SPARC64]: Kill pcic_present().
[SPARC]: Kill 'prom_palette'.
[ATYFB]: Kill 'prom_palette' sparc code.
[SPARC64]: Kill 'prom_keyboard'.
[SPARC]: Kill extern decl of 'panic_setup'.
[SPARC64]: Delete 'boot_flags'.
[SPARC64]: Kill unused function 'kernel_enter_debugger'.
[SPARC64] arch/sparc64/kernel/unaligned.c: Use time_* macros
[SPARC64]: Always register a PROM based early console.
[SPARC64]: Update defconfig.
[SPARC64]: Add -mtune=ultrasparc3 if possible.
[SPARC64]: Remove Makefile code for ancient gcc and binutils.
[SPARC64]: Remove DEBUG_BOOTMEM.
[SPARC64]: Use shorter "get_zeroed_page" call.
[SPARC]: Use shorter form of "get_zeroed_page".
[SPARC]: video/cg14.c and video/sbuslib.c build fixes
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 19186ce8850..0bd69d0b5cd 100644 --- a/arch/sparc/kernel/process.c +++ b/arch/sparc/kernel/process.c @@ -141,16 +141,12 @@ void cpu_idle(void) extern char reboot_command []; -extern void (*prom_palette)(int); - /* XXX cli/sti -> local_irq_xxx here, check this works once SMP is fixed. */ void machine_halt(void) { local_irq_enable(); mdelay(8); local_irq_disable(); - if (prom_palette) - prom_palette (1); prom_halt(); panic("Halt failed!"); } @@ -165,8 +161,6 @@ void machine_restart(char * cmd) p = strchr (reboot_command, '\n'); if (p) *p = 0; - if (prom_palette) - prom_palette (1); if (cmd) prom_reboot(cmd); if (*reboot_command) diff --git a/arch/sparc/kernel/setup.c b/arch/sparc/kernel/setup.c index 3cf78f16084..3c13137685d 100644 --- a/arch/sparc/kernel/setup.c +++ b/arch/sparc/kernel/setup.c @@ -65,7 +65,6 @@ struct screen_info screen_info = { */ extern unsigned long trapbase; -void (*prom_palette)(int); /* Pretty sick eh? */ void prom_sync_me(void) @@ -80,8 +79,6 @@ void prom_sync_me(void) "nop\n\t" "nop\n\t" : : "r" (&trapbase)); - if (prom_palette) - prom_palette(1); prom_printf("PROM SYNC COMMAND...\n"); show_free_areas(); if(current->pid != 0) { @@ -191,7 +188,6 @@ extern int prom_probe_memory(void); extern void sun4c_probe_vac(void); extern char cputypval; extern unsigned long start, end; -extern void panic_setup(char *, int *); extern unsigned short root_flags; extern unsigned short root_dev; |