From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner+w=401wt.eu-S1754028AbZHQTSA@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754028AbZHQTSA (ORCPT <rfc822;w@1wt.eu>);
	Mon, 17 Aug 2009 15:18:00 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753699AbZHQTR7
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Mon, 17 Aug 2009 15:17:59 -0400
Received: from rcsinet11.oracle.com ([148.87.113.123]:36598 "EHLO
	rgminet11.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1753665AbZHQTR6 (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Mon, 17 Aug 2009 15:17:58 -0400
Message-ID: <4A89AC97.6030109@oracle.com>
Date: Mon, 17 Aug 2009 12:16:39 -0700
From: "tina.yang" <tina.yang@oracle.com>
User-Agent: Thunderbird 2.0.0.0 (X11/20070419)
MIME-Version: 1.0
To: linux-kernel@vger.kernel.org
CC: Jiri Kosina <trivial@kernel.org>
Subject: [PATCH] sysrq: add debug message to reboot event
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
X-Source-IP: abhmt006.oracle.com [141.146.116.15]
X-Auth-Type: Internal IP
X-CT-RefId: str=0001.0A090204.4A89AC99.00AB:SCFSTAT5015188,ss=1,fgs=0
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Add debug message to detect keyboard vs non-keyboard
triggered sysrq-b events.

Signed-off-by: Tina Yang <Tina.Yang@oracle.com>
Signed-off-by: Zach Brown <Zach.Brown@oracle.com>

---

--- linux-2.6.git/drivers/char/sysrq.c.orig     2009-08-13
15:43:34.000000000 -0700
+++ linux-2.6.git/drivers/char/sysrq.c  2009-08-13 21:51:15.832694000 -0700
@@ -135,17 +135,22 @@ static struct sysrq_key_op sysrq_crash_o
        .enable_mask    = SYSRQ_ENABLE_DUMP,
 };

-static void sysrq_handle_reboot(int key, struct tty_struct *tty)
+static void sysrq_handle_reboot(int check_mask, int key, struct
tty_struct *tty)
 {
+       if (check_mask)
+               printk("<keyboard-invoked>\n");
+        else
+               printk("<non-keyboard-invoked: PID %d COMMAND %s>\n",
+                               current->pid, current->comm);
        lockdep_off();
        local_irq_enable();
        emergency_restart();
 }
 static struct sysrq_key_op sysrq_reboot_op = {
-       .handler        = sysrq_handle_reboot,
-       .help_msg       = "reBoot",
-       .action_msg     = "Resetting",
-       .enable_mask    = SYSRQ_ENABLE_BOOT,
+       .handler_with_mask      = sysrq_handle_reboot,
+       .help_msg               = "reBoot",
+       .action_msg             = "Resetting",
+       .enable_mask            = SYSRQ_ENABLE_BOOT,
 };

 static void sysrq_handle_sync(int key, struct tty_struct *tty)
@@ -509,7 +514,10 @@ void __handle_sysrq(int key, struct tty_
                if (!check_mask || sysrq_on_mask(op_p->enable_mask)) {
                        printk("%s\n", op_p->action_msg);
                        console_loglevel = orig_log_level;
-                       op_p->handler(key, tty);
+                       if (op_p->handler_with_mask)
+                               op_p->handler_with_mask(check_mask, key,
tty);
+                       else
+                               op_p->handler(key, tty);
                } else {
                        printk("This sysrq operation is disabled.\n");
                }
--- linux-2.6.git/include/linux/sysrq.h.orig    2009-08-13
20:53:48.085786000 -0700
+++ linux-2.6.git/include/linux/sysrq.h 2009-08-13 20:54:12.625756000 -0700
@@ -32,6 +32,7 @@ struct tty_struct;

 struct sysrq_key_op {
        void (*handler)(int, struct tty_struct *);
+       void (*handler_with_mask)(int, int, struct tty_struct *);
        char *help_msg;
        char *action_msg;
        int enable_mask;