Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e45ccc05 authored by Andrew Morton's avatar Andrew Morton Committed by Martin Schwidefsky
Browse files

[S390] workqueue fixes. 



Cc: David Howells <dhowells@redhat.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 22155914

drivers/s390/char/ctrlchar.c

+5 −4
Original line number Diff line number Diff line
@@ -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;

	}