imported patch sysrq-loglevel

diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c
index bef9f57706033c9c530620283d2ed7a4aee53e0f..cc47dddcb1ddf493de1951630070136c8df5f9a0 100644 (file)
--- a/drivers/char/sysrq.c
+++ b/drivers/char/sysrq.c
@@ -404,7 +404,6 @@ void __handle_sysrq(int key, struct pt_regs *pt_regs, struct tty_struct *tty,
                if (!check_mask || sysrq_enabled == 1 ||
                    (sysrq_enabled & op_p->enable_mask)) {
                        printk("%s\n", op_p->action_msg);
-                       console_loglevel = orig_log_level;
                        op_p->handler(key, pt_regs, tty);
                } else {
                        printk("This sysrq operation is disabled.\n");
@@ -425,8 +424,8 @@ void __handle_sysrq(int key, struct pt_regs *pt_regs, struct tty_struct *tty,
                        }
                }
                printk("\n");
-               console_loglevel = orig_log_level;
        }
+       console_loglevel = orig_log_level;
        spin_unlock_irqrestore(&sysrq_key_table_lock, flags);
 }