A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-31 04:01:48 -04:00
Code Issues Projects Releases Packages Wiki Activity

Input: sysrq - drop tty argument form handle_sysrq()

Browse source 
Sysrq operations do not accept tty argument anymore so no need to pass
it to us.

[Stephen Rothwell <[email protected]>: fix build breakage in drm code
 caused by sysrq using bool but not including linux/types.h]

[Sachin Sant <[email protected]>: fix build breakage in s390 keyboadr
 driver]

Acked-by: Alan Cox <[email protected]>
Acked-by: Jason Wessel <[email protected]>
Acked-by: Greg Kroah-Hartman <[email protected]>
Signed-off-by: Dmitry Torokhov <[email protected]>
This commit is contained in:
Dmitry Torokhov 2010-08-17 21:15:47 -07:00
commit f335397d17
14 changed files with 22 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/s390/char/ctrlchar.c
View file

@ -16,12 +16,11 @@
#ifdef CONFIG_MAGIC_SYSRQ
static int ctrlchar_sysrq_key;
static struct tty_struct *sysrq_tty;
static void
ctrlchar_handle_sysrq(struct work_struct *work)
{
handle_sysrq(ctrlchar_sysrq_key, sysrq_tty);
handle_sysrq(ctrlchar_sysrq_key);
}
static DECLARE_WORK(ctrlchar_work, ctrlchar_handle_sysrq);
@ -54,7 +53,6 @@ ctrlchar_handle(const unsigned char *buf, int len, struct tty_struct *tty)
/* racy */
if (len == 3 && buf[1] == '-') {
ctrlchar_sysrq_key = buf[2];
sysrq_tty = tty;
schedule_work(&ctrlchar_work);
return CTRLCHAR_SYSRQ;
}

2
drivers/s390/char/keyboard.c
View file

@ -305,7 +305,7 @@ kbd_keycode(struct kbd_data *kbd, unsigned int keycode)
if (kbd->sysrq) {
if (kbd->sysrq == K(KT_LATIN, '-')) {
kbd->sysrq = 0;
handle_sysrq(value, kbd->tty);
handle_sysrq(value);
return;
}
if (value == '-') {