From 34cce67fff0b72ed7227f962eb54b1bc61b26a8d Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Fri, 8 Dec 2006 15:53:52 +0100 Subject: [PATCH] --- yaml --- r: 43861 b: refs/heads/master c: e45ccc0562e3f391dcba8b2e8a02551e8e42d8db h: refs/heads/master i: 43859: 05bc4759826821cc8a52720752391a8a51dfa408 v: v3 --- [refs] | 2 +- trunk/drivers/s390/char/ctrlchar.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 2217d51be6f4..c031ad16a5ed 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 22155914b66b348b7113a0b3baf96a72bd3f643d +refs/heads/master: e45ccc0562e3f391dcba8b2e8a02551e8e42d8db diff --git a/trunk/drivers/s390/char/ctrlchar.c b/trunk/drivers/s390/char/ctrlchar.c index 49e9628d9297..c6cbcb3f925e 100644 --- a/trunk/drivers/s390/char/ctrlchar.c +++ b/trunk/drivers/s390/char/ctrlchar.c @@ -16,14 +16,15 @@ #ifdef CONFIG_MAGIC_SYSRQ static int ctrlchar_sysrq_key; +static struct tty_struct *sysrq_tty; static void -ctrlchar_handle_sysrq(void *tty) +ctrlchar_handle_sysrq(struct work_struct *work) { - handle_sysrq(ctrlchar_sysrq_key, (struct tty_struct *) tty); + handle_sysrq(ctrlchar_sysrq_key, sysrq_tty); } -static DECLARE_WORK(ctrlchar_work, ctrlchar_handle_sysrq, NULL); +static DECLARE_WORK(ctrlchar_work, ctrlchar_handle_sysrq); #endif @@ -53,7 +54,7 @@ ctrlchar_handle(const unsigned char *buf, int len, struct tty_struct *tty) /* racy */ if (len == 3 && buf[1] == '-') { ctrlchar_sysrq_key = buf[2]; - ctrlchar_work.data = tty; + sysrq_tty = tty; schedule_work(&ctrlchar_work); return CTRLCHAR_SYSRQ; }