The patch titled
remove SYSRQ_KEY and related defines from ppc/sh/h8300
has been added to the -mm tree. Its filename is
remove-sysrq_key-and-related-defines-from-ppc-sh-h8300.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: remove SYSRQ_KEY and related defines from ppc/sh/h8300
: Olaf Hering <olaf@xxxxxxxxx>
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: Olaf Hering <olaf@xxxxxxxxx>
Cc: Paul Mundt <lethal@xxxxxxxxxxxx>
Cc: Kazumoto Kojima <kkojima@xxxxxxxxxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/powerpc/kernel/setup_32.c | 4 ----
arch/powerpc/kernel/setup_64.c | 5 -----
arch/ppc/kernel/setup.c | 4 ----
include/asm-h8300/keyboard.h | 8 --------
include/asm-sh/ec3104/keyboard.h | 2 --
include/asm-sh/mpc1211/keyboard.h | 4 ----
include/asm-sh64/keyboard.h | 4 ----
7 files changed, 31 deletions(-)
diff -puN arch/powerpc/kernel/setup_32.c~remove-sysrq_key-and-related-defines-from-ppc-sh-h8300 arch/powerpc/kernel/setup_32.c
--- a/arch/powerpc/kernel/setup_32.c~remove-sysrq_key-and-related-defines-from-ppc-sh-h8300
+++ a/arch/powerpc/kernel/setup_32.c
@@ -66,10 +66,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
diff -puN arch/powerpc/kernel/setup_64.c~remove-sysrq_key-and-related-defines-from-ppc-sh-h8300 arch/powerpc/kernel/setup_64.c
--- a/arch/powerpc/kernel/setup_64.c~remove-sysrq_key-and-related-defines-from-ppc-sh-h8300
+++ a/arch/powerpc/kernel/setup_64.c
@@ -92,11 +92,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;
diff -puN arch/ppc/kernel/setup.c~remove-sysrq_key-and-related-defines-from-ppc-sh-h8300 arch/ppc/kernel/setup.c
--- a/arch/ppc/kernel/setup.c~remove-sysrq_key-and-related-defines-from-ppc-sh-h8300
+++ a/arch/ppc/kernel/setup.c
@@ -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
diff -puN include/asm-h8300/keyboard.h~remove-sysrq_key-and-related-defines-from-ppc-sh-h8300 include/asm-h8300/keyboard.h
--- a/include/asm-h8300/keyboard.h~remove-sysrq_key-and-related-defines-from-ppc-sh-h8300
+++ a/include/asm-h8300/keyboard.h
@@ -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 */
diff -puN include/asm-sh/ec3104/keyboard.h~remove-sysrq_key-and-related-defines-from-ppc-sh-h8300 include/asm-sh/ec3104/keyboard.h
--- a/include/asm-sh/ec3104/keyboard.h~remove-sysrq_key-and-related-defines-from-ppc-sh-h8300
+++ a/include/asm-sh/ec3104/keyboard.h
@@ -6,8 +6,6 @@ extern char ec3104_kbd_unexpected_up(uns
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
diff -puN include/asm-sh/mpc1211/keyboard.h~remove-sysrq_key-and-related-defines-from-ppc-sh-h8300 include/asm-sh/mpc1211/keyboard.h
--- a/include/asm-sh/mpc1211/keyboard.h~remove-sysrq_key-and-related-defines-from-ppc-sh-h8300
+++ a/include/asm-sh/mpc1211/keyboard.h
@@ -24,7 +24,6 @@ extern void pckbd_leds(unsigned char led
extern void pckbd_init_hw(void);
extern int pckbd_pm_resume(struct pm_dev *, pm_request_t, void *);
extern pm_callback pm_kbd_request_override;
-extern unsigned char pckbd_sysrq_xlate[128];
#define kbd_setkeycode pckbd_setkeycode
#define kbd_getkeycode pckbd_getkeycode
@@ -32,9 +31,6 @@ extern unsigned char pckbd_sysrq_xlate[1
#define kbd_unexpected_up pckbd_unexpected_up
#define kbd_leds pckbd_leds
#define kbd_init_hw pckbd_init_hw
-#define kbd_sysrq_xlate pckbd_sysrq_xlate
-
-#define SYSRQ_KEY 0x54
/* resource allocation */
#define kbd_request_region()
diff -puN include/asm-sh64/keyboard.h~remove-sysrq_key-and-related-defines-from-ppc-sh-h8300 include/asm-sh64/keyboard.h
--- a/include/asm-sh64/keyboard.h~remove-sysrq_key-and-related-defines-from-ppc-sh-h8300
+++ a/include/asm-sh64/keyboard.h
@@ -30,7 +30,6 @@ extern int pckbd_translate(unsigned char
extern char pckbd_unexpected_up(unsigned char keycode);
extern void pckbd_leds(unsigned char leds);
extern void pckbd_init_hw(void);
-extern unsigned char pckbd_sysrq_xlate[128];
#define kbd_setkeycode pckbd_setkeycode
#define kbd_getkeycode pckbd_getkeycode
@@ -38,9 +37,6 @@ extern unsigned char pckbd_sysrq_xlate[1
#define kbd_unexpected_up pckbd_unexpected_up
#define kbd_leds pckbd_leds
#define kbd_init_hw pckbd_init_hw
-#define kbd_sysrq_xlate pckbd_sysrq_xlate
-
-#define SYSRQ_KEY 0x54
/* resource allocation */
#define kbd_request_region()
_
Patches currently in -mm which might be from olaf@xxxxxxxxx are
origin.patch
remove-sysrq_key-and-related-defines-from-ppc-sh-h8300.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
