Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit e45ccc0562e3f391dcba8b2e8a02551e8e42d8db

Authored by Andrew Morton
Committed by Martin Schwidefsky
1 parent 22155914b6
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[S390] workqueue fixes. 

Cc: David Howells <dhowells@redhat.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

Showing 1 changed file with 5 additions and 4 deletions Side-by-side Diff

drivers/s390/char/ctrlchar.c
Diff comments   View file @ e45ccc0
... ... @@ -16,14 +16,15 @@
16 16  
17 17 #ifdef CONFIG_MAGIC_SYSRQ
18 18 static int ctrlchar_sysrq_key;
  19 +static struct tty_struct *sysrq_tty;
19 20  
20 21 static void
21   -ctrlchar_handle_sysrq(void *tty)
  22 +ctrlchar_handle_sysrq(struct work_struct *work)
22 23 {
23   - handle_sysrq(ctrlchar_sysrq_key, (struct tty_struct *) tty);
  24 + handle_sysrq(ctrlchar_sysrq_key, sysrq_tty);
24 25 }
25 26  
26   -static DECLARE_WORK(ctrlchar_work, ctrlchar_handle_sysrq, NULL);
  27 +static DECLARE_WORK(ctrlchar_work, ctrlchar_handle_sysrq);
27 28 #endif
28 29  
29 30  
... ... @@ -53,7 +54,7 @@
53 54 /* racy */
54 55 if (len == 3 && buf[1] == '-') {
55 56 ctrlchar_sysrq_key = buf[2];
56   - ctrlchar_work.data = tty;
  57 + sysrq_tty = tty;
57 58 schedule_work(&ctrlchar_work);
58 59 return CTRLCHAR_SYSRQ;
59 60 }