From e09b41010ba33a20a87472ee821fa407a5b8da36 Mon Sep 17 00:00:00 2001 From: José Pekkarinen Date: Mon, 11 Apr 2016 10:41:07 +0300 Subject: These changes are the raw update to linux-4.4.6-rt14. Kernel sources are taken from kernel.org, and rt patch from the rt wiki download page. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit During the rebasing, the following patch collided: Force tick interrupt and get rid of softirq magic(I70131fb85). Collisions have been removed because its logic was found on the source already. Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769 Signed-off-by: José Pekkarinen --- kernel/drivers/s390/char/ctrlchar.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'kernel/drivers/s390/char/ctrlchar.h') diff --git a/kernel/drivers/s390/char/ctrlchar.h b/kernel/drivers/s390/char/ctrlchar.h index 1a53552f4..59c2d6e55 100644 --- a/kernel/drivers/s390/char/ctrlchar.h +++ b/kernel/drivers/s390/char/ctrlchar.h @@ -7,6 +7,8 @@ */ #include +#include +#include extern unsigned int ctrlchar_handle(const unsigned char *buf, int len, struct tty_struct *tty); @@ -17,3 +19,13 @@ ctrlchar_handle(const unsigned char *buf, int len, struct tty_struct *tty); #define CTRLCHAR_SYSRQ (3 << 8) #define CTRLCHAR_MASK (~0xffu) + + +#ifdef CONFIG_MAGIC_SYSRQ +struct sysrq_work { + int key; + struct work_struct work; +}; + +void schedule_sysrq_work(struct sysrq_work *sw); +#endif -- cgit 1.2.3-korg