[PATCH] janitor: change a few SYSRQ to MAGIC_SYSRQ

From: "Randy.Dunlap" <rddunlap@osdl.org>,
      Domen Puncer <domen@coderock.org>

Noone tested that code to see if it really works?

diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index 84508f21ff68f4ef897c56ffa1424e5b1487f6ba..863c4076daad99195ed0035a1eeedfc5137d6f08 100644 (file)
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -264,7 +264,7 @@ struct thread_info *alloc_thread_info(struct task_struct *task)
        if (!thread)
                thread = ll_alloc_task_struct();
 
-#ifdef CONFIG_SYSRQ
+#ifdef CONFIG_MAGIC_SYSRQ
        /*
         * The stack must be cleared if you want SYSRQ-T to
         * give sensible stack usage information

diff --git a/arch/arm26/kernel/process.c b/arch/arm26/kernel/process.c
index d55c789e6da76048907819a24116e8b7443c9766..09a2f52ad8a8396eeb46cb79212b4d934b96b114 100644 (file)
--- a/arch/arm26/kernel/process.c
+++ b/arch/arm26/kernel/process.c
@@ -257,7 +257,7 @@ struct thread_info *alloc_thread_info(struct task_struct *task)
        if (!thread)
                thread = ll_alloc_task_struct();
 
-#ifdef CONFIG_SYSRQ
+#ifdef CONFIG_MAGIC_SYSRQ
        /*
         * The stack must be cleared if you want SYSRQ-T to
         * give sensible stack usage information

diff --git a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c
index 445d143f2e9b92657df0312e3211bdb881d5d735..e8f0cacc1f4162b243c956b30664330c02450576 100644 (file)
--- a/arch/um/kernel/um_arch.c
+++ b/arch/um/kernel/um_arch.c
@@ -376,7 +376,7 @@ int linux_main(int argc, char **argv)
 static int panic_exit(struct notifier_block *self, unsigned long unused1,
                      void *unused2)
 {
-#ifdef CONFIG_SYSRQ
+#ifdef CONFIG_MAGIC_SYSRQ
        handle_sysrq('p', &current->thread.regs, NULL, NULL);
 #endif
        machine_halt();