These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / s390 / char / ctrlchar.c

diff --git a/kernel/drivers/s390/char/ctrlchar.c b/kernel/drivers/s390/char/ctrlchar.c
index 8de2deb..f7d9258 100644 (file)
--- a/kernel/drivers/s390/char/ctrlchar.c
+++ b/kernel/drivers/s390/char/ctrlchar.c
@@ -14,15 +14,21 @@
 #include "ctrlchar.h"
 
 #ifdef CONFIG_MAGIC_SYSRQ
-static int ctrlchar_sysrq_key;
+static struct sysrq_work ctrlchar_sysrq;
 
 static void
 ctrlchar_handle_sysrq(struct work_struct *work)
 {
-       handle_sysrq(ctrlchar_sysrq_key);
+       struct sysrq_work *sysrq = container_of(work, struct sysrq_work, work);
+
+       handle_sysrq(sysrq->key);
 }
 
-static DECLARE_WORK(ctrlchar_work, ctrlchar_handle_sysrq);
+void schedule_sysrq_work(struct sysrq_work *sw)
+{
+       INIT_WORK(&sw->work, ctrlchar_handle_sysrq);
+       schedule_work(&sw->work);
+}
 #endif
 
 
@@ -51,8 +57,8 @@ ctrlchar_handle(const unsigned char *buf, int len, struct tty_struct *tty)
 #ifdef CONFIG_MAGIC_SYSRQ
        /* racy */
        if (len == 3 && buf[1] == '-') {
-               ctrlchar_sysrq_key = buf[2];
-               schedule_work(&ctrlchar_work);
+               ctrlchar_sysrq.key = buf[2];
+               schedule_sysrq_work(&ctrlchar_sysrq);
                return CTRLCHAR_SYSRQ;
        }
 #endif