Commit fb483883 authored by Olaf Hering's avatar Olaf Hering Committed by Linus Torvalds

[PATCH] remove SYSRQ_KEY and related defines from ppc/sh/h8300

Remove unused global SYSRQ_KEY from ppc and powerpc
Remove unused define SYSRQ_KEY from sh/sh64 and h8300
Remove unused pckbd_sysrq_xlate and kbd_sysrq_xlate usage
Signed-off-by: default avatarOlaf Hering <olaf@aepfle.de>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Kazumoto Kojima <kkojima@rr.iij4u.or.jp>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e4e04088
...@@ -67,10 +67,6 @@ int have_of = 1; ...@@ -67,10 +67,6 @@ int have_of = 1;
dev_t boot_dev; dev_t boot_dev;
#endif /* CONFIG_PPC_MULTIPLATFORM */ #endif /* CONFIG_PPC_MULTIPLATFORM */
#ifdef CONFIG_MAGIC_SYSRQ
unsigned long SYSRQ_KEY = 0x54;
#endif /* CONFIG_MAGIC_SYSRQ */
#ifdef CONFIG_VGA_CONSOLE #ifdef CONFIG_VGA_CONSOLE
unsigned long vgacon_remap_base; unsigned long vgacon_remap_base;
#endif #endif
......
...@@ -93,11 +93,6 @@ int dcache_bsize; ...@@ -93,11 +93,6 @@ int dcache_bsize;
int icache_bsize; int icache_bsize;
int ucache_bsize; int ucache_bsize;
#ifdef CONFIG_MAGIC_SYSRQ
unsigned long SYSRQ_KEY;
#endif /* CONFIG_MAGIC_SYSRQ */
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
static int smt_enabled_cmdline; static int smt_enabled_cmdline;
......
...@@ -86,10 +86,6 @@ int ppc_do_canonicalize_irqs; ...@@ -86,10 +86,6 @@ int ppc_do_canonicalize_irqs;
EXPORT_SYMBOL(ppc_do_canonicalize_irqs); EXPORT_SYMBOL(ppc_do_canonicalize_irqs);
#endif #endif
#ifdef CONFIG_MAGIC_SYSRQ
unsigned long SYSRQ_KEY = 0x54;
#endif /* CONFIG_MAGIC_SYSRQ */
#ifdef CONFIG_VGA_CONSOLE #ifdef CONFIG_VGA_CONSOLE
unsigned long vgacon_remap_base; unsigned long vgacon_remap_base;
#endif #endif
......
...@@ -18,14 +18,6 @@ ...@@ -18,14 +18,6 @@
#define kbd_enable_irq(x...) do {;} while (0) #define kbd_enable_irq(x...) do {;} while (0)
#define kbd_disable_irq(x...) do {;} while (0) #define kbd_disable_irq(x...) do {;} while (0)
/* needed if MAGIC_SYSRQ is enabled for serial console */
#ifndef SYSRQ_KEY
#define SYSRQ_KEY ((unsigned char)(-1))
#define kbd_sysrq_xlate ((unsigned char *)NULL)
#endif
#endif /* _H8300_KEYBOARD_H */ #endif /* _H8300_KEYBOARD_H */
......
...@@ -6,8 +6,6 @@ extern char ec3104_kbd_unexpected_up(unsigned char); ...@@ -6,8 +6,6 @@ extern char ec3104_kbd_unexpected_up(unsigned char);
extern void ec3104_kbd_leds(unsigned char); extern void ec3104_kbd_leds(unsigned char);
extern void ec3104_kbd_init_hw(void); extern void ec3104_kbd_init_hw(void);
#define SYSRQ_KEY 0x54
#define kbd_sysrq_xlate ec3104_kbd_sysrq_xlate #define kbd_sysrq_xlate ec3104_kbd_sysrq_xlate
#define kbd_setkeycode ec3104_kbd_setkeycode #define kbd_setkeycode ec3104_kbd_setkeycode
#define kbd_getkeycode ec3104_kbd_getkeycode #define kbd_getkeycode ec3104_kbd_getkeycode
......
...@@ -24,7 +24,6 @@ extern void pckbd_leds(unsigned char leds); ...@@ -24,7 +24,6 @@ extern void pckbd_leds(unsigned char leds);
extern void pckbd_init_hw(void); extern void pckbd_init_hw(void);
extern int pckbd_pm_resume(struct pm_dev *, pm_request_t, void *); extern int pckbd_pm_resume(struct pm_dev *, pm_request_t, void *);
extern pm_callback pm_kbd_request_override; extern pm_callback pm_kbd_request_override;
extern unsigned char pckbd_sysrq_xlate[128];
#define kbd_setkeycode pckbd_setkeycode #define kbd_setkeycode pckbd_setkeycode
#define kbd_getkeycode pckbd_getkeycode #define kbd_getkeycode pckbd_getkeycode
...@@ -32,9 +31,6 @@ extern unsigned char pckbd_sysrq_xlate[128]; ...@@ -32,9 +31,6 @@ extern unsigned char pckbd_sysrq_xlate[128];
#define kbd_unexpected_up pckbd_unexpected_up #define kbd_unexpected_up pckbd_unexpected_up
#define kbd_leds pckbd_leds #define kbd_leds pckbd_leds
#define kbd_init_hw pckbd_init_hw #define kbd_init_hw pckbd_init_hw
#define kbd_sysrq_xlate pckbd_sysrq_xlate
#define SYSRQ_KEY 0x54
/* resource allocation */ /* resource allocation */
#define kbd_request_region() #define kbd_request_region()
......
...@@ -30,7 +30,6 @@ extern int pckbd_translate(unsigned char scancode, unsigned char *keycode, ...@@ -30,7 +30,6 @@ extern int pckbd_translate(unsigned char scancode, unsigned char *keycode,
extern char pckbd_unexpected_up(unsigned char keycode); extern char pckbd_unexpected_up(unsigned char keycode);
extern void pckbd_leds(unsigned char leds); extern void pckbd_leds(unsigned char leds);
extern void pckbd_init_hw(void); extern void pckbd_init_hw(void);
extern unsigned char pckbd_sysrq_xlate[128];
#define kbd_setkeycode pckbd_setkeycode #define kbd_setkeycode pckbd_setkeycode
#define kbd_getkeycode pckbd_getkeycode #define kbd_getkeycode pckbd_getkeycode
...@@ -38,9 +37,6 @@ extern unsigned char pckbd_sysrq_xlate[128]; ...@@ -38,9 +37,6 @@ extern unsigned char pckbd_sysrq_xlate[128];
#define kbd_unexpected_up pckbd_unexpected_up #define kbd_unexpected_up pckbd_unexpected_up
#define kbd_leds pckbd_leds #define kbd_leds pckbd_leds
#define kbd_init_hw pckbd_init_hw #define kbd_init_hw pckbd_init_hw
#define kbd_sysrq_xlate pckbd_sysrq_xlate
#define SYSRQ_KEY 0x54
/* resource allocation */ /* resource allocation */
#define kbd_request_region() #define kbd_request_region()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment