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

Commit 2637d139 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: pxa27x_keypad - remove input_free_device() in pxa27x_keypad_remove()
  Input: mousedev - fix regression of inverting axes
  Input: uinput - add devname alias to allow module on-demand load
  Input: hil_kbd - fix compile error
  USB: drop tty argument from usb_serial_handle_sysrq_char()
  Input: sysrq - drop tty argument form handle_sysrq()
  Input: sysrq - drop tty argument from sysrq ops handlers
parents 494e2fbe 288933c0

arch/arm/kernel/etm.c

+1 −1
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ static void etm_dump(void) 
	etb_lock(t);

}



static void sysrq_etm_dump(int key, struct tty_struct *tty)

static void sysrq_etm_dump(int key)

{

	dev_dbg(tracer.dev, "Dumping ETB buffer\n");

	etm_dump();

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/powerpc/xmon/xmon.c

+2 −3
Original line number Diff line number Diff line
@@ -2880,15 +2880,14 @@ static void xmon_init(int enable) 
}



#ifdef CONFIG_MAGIC_SYSRQ

static void sysrq_handle_xmon(int key, struct tty_struct *tty) 

static void sysrq_handle_xmon(int key)

{

	/* ensure xmon is enabled */

	xmon_init(1);

	debugger(get_irq_regs());

}



static struct sysrq_key_op sysrq_xmon_op = 

{

static struct sysrq_key_op sysrq_xmon_op = {

	.handler =	sysrq_handle_xmon,

	.help_msg =	"Xmon",

	.action_msg =	"Entering xmon",

arch/sparc/kernel/process_64.c

+1 −1
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ void arch_trigger_all_cpu_backtrace(void) 


#ifdef CONFIG_MAGIC_SYSRQ



static void sysrq_handle_globreg(int key, struct tty_struct *tty)

static void sysrq_handle_globreg(int key)

{

	arch_trigger_all_cpu_backtrace();

}

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)