diff options
author | David S. Miller <davem@davemloft.net> | 2008-02-18 18:28:16 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-02-18 18:28:16 -0500 |
commit | 667bc389c716389795c6cfa145ab5ef6279fbb62 (patch) | |
tree | 53a240acf9e4eef42cec6de3c8324f04cbc0c094 /arch/sparc64 | |
parent | 30b3cfe1f67550bb6ec6868507a78060ef98269a (diff) |
[SPARC]: Kill 'prom_palette'.
The idea of this thing is we could save/restore the firmware's
palette when breaking in and out of the firmware prompt.
Only one driver implemented this (atyfb) and it's value is
questionable. If you're just debugging you don't really
care that the characters end up being purple or whatever.
And we can provide better debugging and firmware command
facilities with minimal in-kernel console I/O drivers.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64')
-rw-r--r-- | arch/sparc64/kernel/process.c | 8 | ||||
-rw-r--r-- | arch/sparc64/kernel/setup.c | 2 | ||||
-rw-r--r-- | arch/sparc64/kernel/sparc64_ksyms.c | 3 | ||||
-rw-r--r-- | arch/sparc64/prom/misc.c | 9 |
4 files changed, 0 insertions, 22 deletions
diff --git a/arch/sparc64/kernel/process.c b/arch/sparc64/kernel/process.c index d7e8e80d43a5..6eceac51ae62 100644 --- a/arch/sparc64/kernel/process.c +++ b/arch/sparc64/kernel/process.c | |||
@@ -113,13 +113,9 @@ void cpu_idle(void) | |||
113 | 113 | ||
114 | extern char reboot_command []; | 114 | extern char reboot_command []; |
115 | 115 | ||
116 | extern void (*prom_palette)(int); | ||
117 | |||
118 | void machine_halt(void) | 116 | void machine_halt(void) |
119 | { | 117 | { |
120 | sstate_halt(); | 118 | sstate_halt(); |
121 | if (prom_palette) | ||
122 | prom_palette (1); | ||
123 | prom_halt(); | 119 | prom_halt(); |
124 | panic("Halt failed!"); | 120 | panic("Halt failed!"); |
125 | } | 121 | } |
@@ -127,8 +123,6 @@ void machine_halt(void) | |||
127 | void machine_alt_power_off(void) | 123 | void machine_alt_power_off(void) |
128 | { | 124 | { |
129 | sstate_poweroff(); | 125 | sstate_poweroff(); |
130 | if (prom_palette) | ||
131 | prom_palette(1); | ||
132 | prom_halt_power_off(); | 126 | prom_halt_power_off(); |
133 | panic("Power-off failed!"); | 127 | panic("Power-off failed!"); |
134 | } | 128 | } |
@@ -140,8 +134,6 @@ void machine_restart(char * cmd) | |||
140 | sstate_reboot(); | 134 | sstate_reboot(); |
141 | p = strchr (reboot_command, '\n'); | 135 | p = strchr (reboot_command, '\n'); |
142 | if (p) *p = 0; | 136 | if (p) *p = 0; |
143 | if (prom_palette) | ||
144 | prom_palette (1); | ||
145 | if (cmd) | 137 | if (cmd) |
146 | prom_reboot(cmd); | 138 | prom_reboot(cmd); |
147 | if (*reboot_command) | 139 | if (*reboot_command) |
diff --git a/arch/sparc64/kernel/setup.c b/arch/sparc64/kernel/setup.c index 577c823b0529..d036dbe72864 100644 --- a/arch/sparc64/kernel/setup.c +++ b/arch/sparc64/kernel/setup.c | |||
@@ -68,8 +68,6 @@ struct screen_info screen_info = { | |||
68 | 16 /* orig-video-points */ | 68 | 16 /* orig-video-points */ |
69 | }; | 69 | }; |
70 | 70 | ||
71 | void (*prom_palette)(int); | ||
72 | |||
73 | static void | 71 | static void |
74 | prom_console_write(struct console *con, const char *s, unsigned n) | 72 | prom_console_write(struct console *con, const char *s, unsigned n) |
75 | { | 73 | { |
diff --git a/arch/sparc64/kernel/sparc64_ksyms.c b/arch/sparc64/kernel/sparc64_ksyms.c index 68db08930399..51fa773f38c9 100644 --- a/arch/sparc64/kernel/sparc64_ksyms.c +++ b/arch/sparc64/kernel/sparc64_ksyms.c | |||
@@ -85,7 +85,6 @@ extern int (*handle_mathemu)(struct pt_regs *, struct fpustate *); | |||
85 | extern long sparc32_open(const char __user * filename, int flags, int mode); | 85 | extern long sparc32_open(const char __user * filename, int flags, int mode); |
86 | extern int io_remap_pfn_range(struct vm_area_struct *vma, unsigned long from, | 86 | extern int io_remap_pfn_range(struct vm_area_struct *vma, unsigned long from, |
87 | unsigned long pfn, unsigned long size, pgprot_t prot); | 87 | unsigned long pfn, unsigned long size, pgprot_t prot); |
88 | extern void (*prom_palette)(int); | ||
89 | 88 | ||
90 | extern int __ashrdi3(int, int); | 89 | extern int __ashrdi3(int, int); |
91 | 90 | ||
@@ -355,5 +354,3 @@ EXPORT_SYMBOL(xor_niagara_2); | |||
355 | EXPORT_SYMBOL(xor_niagara_3); | 354 | EXPORT_SYMBOL(xor_niagara_3); |
356 | EXPORT_SYMBOL(xor_niagara_4); | 355 | EXPORT_SYMBOL(xor_niagara_4); |
357 | EXPORT_SYMBOL(xor_niagara_5); | 356 | EXPORT_SYMBOL(xor_niagara_5); |
358 | |||
359 | EXPORT_SYMBOL(prom_palette); | ||
diff --git a/arch/sparc64/prom/misc.c b/arch/sparc64/prom/misc.c index bbec7522826c..47a877a15abd 100644 --- a/arch/sparc64/prom/misc.c +++ b/arch/sparc64/prom/misc.c | |||
@@ -55,9 +55,6 @@ void prom_feval(const char *fstring) | |||
55 | P1275_INOUT(1, 1), fstring); | 55 | P1275_INOUT(1, 1), fstring); |
56 | } | 56 | } |
57 | 57 | ||
58 | /* We want to do this more nicely some day. */ | ||
59 | extern void (*prom_palette)(int); | ||
60 | |||
61 | #ifdef CONFIG_SMP | 58 | #ifdef CONFIG_SMP |
62 | extern void smp_capture(void); | 59 | extern void smp_capture(void); |
63 | extern void smp_release(void); | 60 | extern void smp_release(void); |
@@ -72,9 +69,6 @@ void prom_cmdline(void) | |||
72 | 69 | ||
73 | local_irq_save(flags); | 70 | local_irq_save(flags); |
74 | 71 | ||
75 | if (prom_palette) | ||
76 | prom_palette(1); | ||
77 | |||
78 | #ifdef CONFIG_SMP | 72 | #ifdef CONFIG_SMP |
79 | smp_capture(); | 73 | smp_capture(); |
80 | #endif | 74 | #endif |
@@ -85,9 +79,6 @@ void prom_cmdline(void) | |||
85 | smp_release(); | 79 | smp_release(); |
86 | #endif | 80 | #endif |
87 | 81 | ||
88 | if (prom_palette) | ||
89 | prom_palette(0); | ||
90 | |||
91 | local_irq_restore(flags); | 82 | local_irq_restore(flags); |
92 | } | 83 | } |
93 | 84 | ||