diff --git a/[refs] b/[refs] index 4e20560208e8..4bfda870c3bd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 47c33d9c1984ae4c5bd1f144024eacc14c5bc0c0 +refs/heads/master: fb144adc517d9ebe8fd8d98a5696fb68ec91e1f5 diff --git a/trunk/drivers/char/sysrq.c b/trunk/drivers/char/sysrq.c index d41b9f6f7903..33a9351c896d 100644 --- a/trunk/drivers/char/sysrq.c +++ b/trunk/drivers/char/sysrq.c @@ -473,6 +473,12 @@ void __handle_sysrq(int key, struct tty_struct *tty, int check_mask) unsigned long flags; spin_lock_irqsave(&sysrq_key_table_lock, flags); + /* + * Raise the apparent loglevel to maximum so that the sysrq header + * is shown to provide the user with positive feedback. We do not + * simply emit this at KERN_EMERG as that would change message + * routing in the consumers of /proc/kmsg. + */ orig_log_level = console_loglevel; console_loglevel = 7; printk(KERN_INFO "SysRq : ");