From: 黄涛 <huangtao@rock-chips.com>
Date: Mon, 1 Aug 2011 03:20:53 +0000 (+0800)
Subject: rk_sysrq: fix for v2.6.36
X-Git-Tag: firefly_0821_release~9807
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=89c416b443b432a1144e055d6cc4327c71ccfbce;p=firefly-linux-kernel-4.4.55.git

rk_sysrq: fix for v2.6.36
---

diff --git a/drivers/char/rk_sysrq.c b/drivers/char/rk_sysrq.c
index af0933555881..eb741935f57c 100755
--- a/drivers/char/rk_sysrq.c
+++ b/drivers/char/rk_sysrq.c
@@ -38,6 +38,7 @@
 #include <linux/workqueue.h>
 #include <linux/hrtimer.h>
 #include <linux/oom.h>
+#include <linux/version.h>
 
 #include <asm/ptrace.h>
 #include <asm/irq_regs.h>
@@ -744,7 +745,11 @@ void __rk_handle_sysrq(int key, struct tty_struct *tty, int check_mask)
 		if (!check_mask || rk_sysrq_on_mask(op_p->enable_mask)) {
 			printk("%s\n", op_p->action_msg);
 			console_loglevel = orig_log_level;
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36))
+			op_p->handler(key);
+#else
 			op_p->handler(key, tty);
+#endif
 		} else {
 			printk("This sysrq operation is disabled.\n");
 		}