Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[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

arch/powerpc/kernel/setup_32.c

+0 −4
Original line number Diff line number Diff line
@@ -67,10 +67,6 @@ int have_of = 1; 
dev_t boot_dev;

#endif /* CONFIG_PPC_MULTIPLATFORM */



#ifdef CONFIG_MAGIC_SYSRQ

unsigned long SYSRQ_KEY = 0x54;

#endif /* CONFIG_MAGIC_SYSRQ */



#ifdef CONFIG_VGA_CONSOLE

unsigned long vgacon_remap_base;

#endif

arch/powerpc/kernel/setup_64.c

+0 −5
Original line number Diff line number Diff line
@@ -93,11 +93,6 @@ int dcache_bsize; 
int icache_bsize;

int ucache_bsize;



#ifdef CONFIG_MAGIC_SYSRQ

unsigned long SYSRQ_KEY;

#endif /* CONFIG_MAGIC_SYSRQ */





#ifdef CONFIG_SMP



static int smt_enabled_cmdline;

arch/ppc/kernel/setup.c

+0 −4
Original line number Diff line number Diff line
@@ -86,10 +86,6 @@ int ppc_do_canonicalize_irqs; 
EXPORT_SYMBOL(ppc_do_canonicalize_irqs);

#endif



#ifdef CONFIG_MAGIC_SYSRQ

unsigned long SYSRQ_KEY = 0x54;

#endif /* CONFIG_MAGIC_SYSRQ */



#ifdef CONFIG_VGA_CONSOLE

unsigned long vgacon_remap_base;

#endif

include/asm-h8300/keyboard.h

+0 −8
Original line number Diff line number Diff line
@@ -18,14 +18,6 @@ 
#define kbd_enable_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 */

include/asm-sh/ec3104/keyboard.h

+0 −2
Original line number Diff line number Diff line
@@ -6,8 +6,6 @@ extern char ec3104_kbd_unexpected_up(unsigned char); 
extern void ec3104_kbd_leds(unsigned char);

extern void ec3104_kbd_init_hw(void);



#define SYSRQ_KEY 0x54



#define kbd_sysrq_xlate ec3104_kbd_sysrq_xlate

#define kbd_setkeycode ec3104_kbd_setkeycode

#define kbd_getkeycode ec3104_kbd_getkeycode