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

Commit f335397d authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Input: sysrq - drop tty argument form handle_sysrq() 



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

[Stephen Rothwell <sfr@canb.auug.org.au>: fix build breakage in drm code
 caused by sysrq using bool but not including linux/types.h]

[Sachin Sant <sachinp@in.ibm.com>: fix build breakage in s390 keyboadr
 driver]

Acked-by: default avatarAlan Cox <alan@lxorguk.ukuu.org.uk>
Acked-by: default avatarJason Wessel <jason.wessel@windriver.com>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 1495cc9d

arch/ia64/hp/sim/simserial.c

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ static void receive_chars(struct tty_struct *tty) 
						ch = ia64_ssc(0, 0, 0, 0,

							      SSC_GETCHAR);

					while (!ch);

					handle_sysrq(ch, NULL);

					handle_sysrq(ch);

				}

#endif

				seen_esc = 0;

arch/um/drivers/mconsole_kern.c

+1 −1
Original line number Diff line number Diff line
@@ -690,7 +690,7 @@ static void with_console(struct mc_request *req, void (*proc)(void *), 
static void sysrq_proc(void *arg)

{

	char *op = arg;

	handle_sysrq(*op, NULL);

	handle_sysrq(*op);

}



void mconsole_sysrq(struct mc_request *req)

drivers/char/hangcheck-timer.c

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ static void hangcheck_fire(unsigned long data) 
		if (hangcheck_dump_tasks) {

			printk(KERN_CRIT "Hangcheck: Task state:\n");

#ifdef CONFIG_MAGIC_SYSRQ

			handle_sysrq('t', NULL);

			handle_sysrq('t');

#endif  /* CONFIG_MAGIC_SYSRQ */

		}

		if (hangcheck_reboot) {

drivers/char/hvc_console.c

+1 −1
Original line number Diff line number Diff line
@@ -651,7 +651,7 @@ int hvc_poll(struct hvc_struct *hp) 
					if (sysrq_pressed)

						continue;

				} else if (sysrq_pressed) {

					handle_sysrq(buf[i], tty);

					handle_sysrq(buf[i]);

					sysrq_pressed = 0;

					continue;

				}

drivers/char/hvsi.c

+1 −1
Original line number Diff line number Diff line
@@ -403,7 +403,7 @@ static void hvsi_insert_chars(struct hvsi_struct *hp, const char *buf, int len) 
			hp->sysrq = 1;

			continue;

		} else if (hp->sysrq) {

			handle_sysrq(c, hp->tty);

			handle_sysrq(c);

			hp->sysrq = 0;

			continue;

		}