Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+75
-80
+1
-1
arch/arm/kernel/etm.c
+1
-1
arch/arm/kernel/etm.c
+1
-1
arch/ia64/hp/sim/simserial.c
+1
-1
arch/ia64/hp/sim/simserial.c
+2
-3
arch/powerpc/xmon/xmon.c
+2
-3
arch/powerpc/xmon/xmon.c
···
2880
2880
}
2881
2881
2882
2882
#ifdef CONFIG_MAGIC_SYSRQ
2883
-
static void sysrq_handle_xmon(int key, struct tty_struct *tty)
2883
+
static void sysrq_handle_xmon(int key)
2884
2884
{
2885
2885
/* ensure xmon is enabled */
2886
2886
xmon_init(1);
2887
2887
debugger(get_irq_regs());
2888
2888
}
2889
2889
2890
-
static struct sysrq_key_op sysrq_xmon_op =
2891
-
{
2890
+
static struct sysrq_key_op sysrq_xmon_op = {
2892
2891
.handler = sysrq_handle_xmon,
2893
2892
.help_msg = "Xmon",
2894
2893
.action_msg = "Entering xmon",
+1
-1
arch/sparc/kernel/process_64.c
+1
-1
arch/sparc/kernel/process_64.c
+1
-1
arch/um/drivers/mconsole_kern.c
+1
-1
arch/um/drivers/mconsole_kern.c
+1
-1
drivers/char/hangcheck-timer.c
+1
-1
drivers/char/hangcheck-timer.c
+1
-1
drivers/char/hvc_console.c
+1
-1
drivers/char/hvc_console.c
+1
-1
drivers/char/hvsi.c
+1
-1
drivers/char/hvsi.c
+26
-27
drivers/char/sysrq.c
+26
-27
drivers/char/sysrq.c
···
18
18
#include <linux/interrupt.h>
19
19
#include <linux/mm.h>
20
20
#include <linux/fs.h>
21
-
#include <linux/tty.h>
22
21
#include <linux/mount.h>
23
22
#include <linux/kdev_t.h>
24
23
#include <linux/major.h>
···
75
76
__setup("sysrq_always_enabled", sysrq_always_enabled_setup);
76
77
77
78
78
-
static void sysrq_handle_loglevel(int key, struct tty_struct *tty)
79
+
static void sysrq_handle_loglevel(int key)
79
80
{
80
81
int i;
81
82
···
92
93
};
93
94
94
95
#ifdef CONFIG_VT
95
-
static void sysrq_handle_SAK(int key, struct tty_struct *tty)
96
+
static void sysrq_handle_SAK(int key)
96
97
{
97
98
struct work_struct *SAK_work = &vc_cons[fg_console].SAK_work;
98
99
schedule_work(SAK_work);
···
108
109
#endif
109
110
110
111
#ifdef CONFIG_VT
111
-
static void sysrq_handle_unraw(int key, struct tty_struct *tty)
112
+
static void sysrq_handle_unraw(int key)
112
113
{
113
114
struct kbd_struct *kbd = &kbd_table[fg_console];
114
115
···
125
126
#define sysrq_unraw_op (*(struct sysrq_key_op *)NULL)
126
127
#endif /* CONFIG_VT */
127
128
128
-
static void sysrq_handle_crash(int key, struct tty_struct *tty)
129
+
static void sysrq_handle_crash(int key)
129
130
{
130
131
char *killer = NULL;
131
132
···
140
141
.enable_mask = SYSRQ_ENABLE_DUMP,
141
142
};
142
143
143
-
static void sysrq_handle_reboot(int key, struct tty_struct *tty)
144
+
static void sysrq_handle_reboot(int key)
144
145
{
145
146
lockdep_off();
146
147
local_irq_enable();
···
153
154
.enable_mask = SYSRQ_ENABLE_BOOT,
154
155
};
155
156
156
-
static void sysrq_handle_sync(int key, struct tty_struct *tty)
157
+
static void sysrq_handle_sync(int key)
157
158
{
158
159
emergency_sync();
159
160
}
···
164
165
.enable_mask = SYSRQ_ENABLE_SYNC,
165
166
};
166
167
167
-
static void sysrq_handle_show_timers(int key, struct tty_struct *tty)
168
+
static void sysrq_handle_show_timers(int key)
168
169
{
169
170
sysrq_timer_list_show();
170
171
}
···
175
176
.action_msg = "Show clockevent devices & pending hrtimers (no others)",
176
177
};
177
178
178
-
static void sysrq_handle_mountro(int key, struct tty_struct *tty)
179
+
static void sysrq_handle_mountro(int key)
179
180
{
180
181
emergency_remount();
181
182
}
···
187
188
};
188
189
189
190
#ifdef CONFIG_LOCKDEP
190
-
static void sysrq_handle_showlocks(int key, struct tty_struct *tty)
191
+
static void sysrq_handle_showlocks(int key)
191
192
{
192
193
debug_show_all_locks();
193
194
}
···
225
226
226
227
static DECLARE_WORK(sysrq_showallcpus, sysrq_showregs_othercpus);
227
228
228
-
static void sysrq_handle_showallcpus(int key, struct tty_struct *tty)
229
+
static void sysrq_handle_showallcpus(int key)
229
230
{
230
231
/*
231
232
* Fall back to the workqueue based printing if the
···
251
252
};
252
253
#endif
253
254
254
-
static void sysrq_handle_showregs(int key, struct tty_struct *tty)
255
+
static void sysrq_handle_showregs(int key)
255
256
{
256
257
struct pt_regs *regs = get_irq_regs();
257
258
if (regs)
···
265
266
.enable_mask = SYSRQ_ENABLE_DUMP,
266
267
};
267
268
268
-
static void sysrq_handle_showstate(int key, struct tty_struct *tty)
269
+
static void sysrq_handle_showstate(int key)
269
270
{
270
271
show_state();
271
272
}
···
276
277
.enable_mask = SYSRQ_ENABLE_DUMP,
277
278
};
278
279
279
-
static void sysrq_handle_showstate_blocked(int key, struct tty_struct *tty)
280
+
static void sysrq_handle_showstate_blocked(int key)
280
281
{
281
282
show_state_filter(TASK_UNINTERRUPTIBLE);
282
283
}
···
290
291
#ifdef CONFIG_TRACING
291
292
#include <linux/ftrace.h>
292
293
293
-
static void sysrq_ftrace_dump(int key, struct tty_struct *tty)
294
+
static void sysrq_ftrace_dump(int key)
294
295
{
295
296
ftrace_dump(DUMP_ALL);
296
297
}
···
304
305
#define sysrq_ftrace_dump_op (*(struct sysrq_key_op *)NULL)
305
306
#endif
306
307
307
-
static void sysrq_handle_showmem(int key, struct tty_struct *tty)
308
+
static void sysrq_handle_showmem(int key)
308
309
{
309
310
show_mem();
310
311
}
···
329
330
}
330
331
}
331
332
332
-
static void sysrq_handle_term(int key, struct tty_struct *tty)
333
+
static void sysrq_handle_term(int key)
333
334
{
334
335
send_sig_all(SIGTERM);
335
336
console_loglevel = 8;
···
348
349
349
350
static DECLARE_WORK(moom_work, moom_callback);
350
351
351
-
static void sysrq_handle_moom(int key, struct tty_struct *tty)
352
+
static void sysrq_handle_moom(int key)
352
353
{
353
354
schedule_work(&moom_work);
354
355
}
···
360
361
};
361
362
362
363
#ifdef CONFIG_BLOCK
363
-
static void sysrq_handle_thaw(int key, struct tty_struct *tty)
364
+
static void sysrq_handle_thaw(int key)
364
365
{
365
366
emergency_thaw_all();
366
367
}
···
372
373
};
373
374
#endif
374
375
375
-
static void sysrq_handle_kill(int key, struct tty_struct *tty)
376
+
static void sysrq_handle_kill(int key)
376
377
{
377
378
send_sig_all(SIGKILL);
378
379
console_loglevel = 8;
···
384
385
.enable_mask = SYSRQ_ENABLE_SIGNAL,
385
386
};
386
387
387
-
static void sysrq_handle_unrt(int key, struct tty_struct *tty)
388
+
static void sysrq_handle_unrt(int key)
388
389
{
389
390
normalize_rt_tasks();
390
391
}
···
492
493
sysrq_key_table[i] = op_p;
493
494
}
494
495
495
-
void __handle_sysrq(int key, struct tty_struct *tty, int check_mask)
496
+
void __handle_sysrq(int key, bool check_mask)
496
497
{
497
498
struct sysrq_key_op *op_p;
498
499
int orig_log_level;
···
519
520
if (!check_mask || sysrq_on_mask(op_p->enable_mask)) {
520
521
printk("%s\n", op_p->action_msg);
521
522
console_loglevel = orig_log_level;
522
-
op_p->handler(key, tty);
523
+
op_p->handler(key);
523
524
} else {
524
525
printk("This sysrq operation is disabled.\n");
525
526
}
···
544
545
spin_unlock_irqrestore(&sysrq_key_table_lock, flags);
545
546
}
546
547
547
-
void handle_sysrq(int key, struct tty_struct *tty)
548
+
void handle_sysrq(int key)
548
549
{
549
550
if (sysrq_on())
550
-
__handle_sysrq(key, tty, 1);
551
+
__handle_sysrq(key, true);
551
552
}
552
553
EXPORT_SYMBOL(handle_sysrq);
553
554
···
596
597
597
598
default:
598
599
if (sysrq_down && value && value != 2)
599
-
__handle_sysrq(sysrq_xlate[code], NULL, 1);
600
+
__handle_sysrq(sysrq_xlate[code], true);
600
601
break;
601
602
}
602
603
···
764
765
765
766
if (get_user(c, buf))
766
767
return -EFAULT;
767
-
__handle_sysrq(c, NULL, 0);
768
+
__handle_sysrq(c, false);
768
769
}
769
770
770
771
return count;
+1
-1
drivers/gpu/drm/drm_fb_helper.c
+1
-1
drivers/gpu/drm/drm_fb_helper.c
···
370
370
}
371
371
static DECLARE_WORK(drm_fb_helper_restore_work, drm_fb_helper_restore_work_fn);
372
372
373
-
static void drm_fb_helper_sysrq(int dummy1, struct tty_struct *dummy3)
373
+
static void drm_fb_helper_sysrq(int dummy1)
374
374
{
375
375
schedule_work(&drm_fb_helper_restore_work);
376
376
}
+6
-6
drivers/input/keyboard/hil_kbd.c
+6
-6
drivers/input/keyboard/hil_kbd.c
···
232
232
if (absdev) {
233
233
val = lo + (hi << 8);
234
234
#ifdef TABLET_AUTOADJUST
235
-
if (val < input_abs_min(dev, ABS_X + i))
235
+
if (val < input_abs_get_min(dev, ABS_X + i))
236
236
input_abs_set_min(dev, ABS_X + i, val);
237
-
if (val > input_abs_max(dev, ABS_X + i))
237
+
if (val > input_abs_get_max(dev, ABS_X + i))
238
238
input_abs_set_max(dev, ABS_X + i, val);
239
239
#endif
240
240
if (i % 3)
241
-
val = input_abs_max(dev, ABS_X + i) - val;
241
+
val = input_abs_get_max(dev, ABS_X + i) - val;
242
242
input_report_abs(dev, ABS_X + i, val);
243
243
} else {
244
244
val = (int) (((int8_t) lo) | ((int8_t) hi << 8));
···
388
388
389
389
#ifdef TABLET_AUTOADJUST
390
390
for (i = 0; i < ABS_MAX; i++) {
391
-
int diff = input_abs_max(input_dev, ABS_X + i) / 10;
391
+
int diff = input_abs_get_max(input_dev, ABS_X + i) / 10;
392
392
input_abs_set_min(input_dev, ABS_X + i,
393
-
input_abs_min(input_dev, ABS_X + i) + diff)
393
+
input_abs_get_min(input_dev, ABS_X + i) + diff);
394
394
input_abs_set_max(input_dev, ABS_X + i,
395
-
input_abs_max(input_dev, ABS_X + i) - diff)
395
+
input_abs_get_max(input_dev, ABS_X + i) - diff);
396
396
}
397
397
#endif
398
398
-2
drivers/input/keyboard/pxa27x_keypad.c
-2
drivers/input/keyboard/pxa27x_keypad.c
+2
drivers/input/misc/uinput.c
+2
drivers/input/misc/uinput.c
+4
-4
drivers/input/mousedev.c
+4
-4
drivers/input/mousedev.c
···
138
138
139
139
fx(0) = value;
140
140
if (mousedev->touch && mousedev->pkt_count >= 2) {
141
-
size = input_abs_get_min(dev, ABS_X) -
142
-
input_abs_get_max(dev, ABS_X);
141
+
size = input_abs_get_max(dev, ABS_X) -
142
+
input_abs_get_min(dev, ABS_X);
143
143
if (size == 0)
144
144
size = 256 * 2;
145
145
···
155
155
fy(0) = value;
156
156
if (mousedev->touch && mousedev->pkt_count >= 2) {
157
157
/* use X size for ABS_Y to keep the same scale */
158
-
size = input_abs_get_min(dev, ABS_X) -
159
-
input_abs_get_max(dev, ABS_X);
158
+
size = input_abs_get_max(dev, ABS_X) -
159
+
input_abs_get_min(dev, ABS_X);
160
160
if (size == 0)
161
161
size = 256 * 2;
162
162
+1
-1
drivers/net/ibm_newemac/debug.c
+1
-1
drivers/net/ibm_newemac/debug.c
+1
-3
drivers/s390/char/ctrlchar.c
+1
-3
drivers/s390/char/ctrlchar.c
···
16
16
17
17
#ifdef CONFIG_MAGIC_SYSRQ
18
18
static int ctrlchar_sysrq_key;
19
-
static struct tty_struct *sysrq_tty;
20
19
21
20
static void
22
21
ctrlchar_handle_sysrq(struct work_struct *work)
23
22
{
24
-
handle_sysrq(ctrlchar_sysrq_key, sysrq_tty);
23
+
handle_sysrq(ctrlchar_sysrq_key);
25
24
}
26
25
27
26
static DECLARE_WORK(ctrlchar_work, ctrlchar_handle_sysrq);
···
53
54
/* racy */
54
55
if (len == 3 && buf[1] == '-') {
55
56
ctrlchar_sysrq_key = buf[2];
56
-
sysrq_tty = tty;
57
57
schedule_work(&ctrlchar_work);
58
58
return CTRLCHAR_SYSRQ;
59
59
}
+1
-1
drivers/s390/char/keyboard.c
+1
-1
drivers/s390/char/keyboard.c
+1
-1
drivers/serial/sn_console.c
+1
-1
drivers/serial/sn_console.c
···
492
492
sysrq_requested = 0;
493
493
if (ch && time_before(jiffies, sysrq_timeout)) {
494
494
spin_unlock_irqrestore(&port->sc_port.lock, flags);
495
-
handle_sysrq(ch, NULL);
495
+
handle_sysrq(ch);
496
496
spin_lock_irqsave(&port->sc_port.lock, flags);
497
497
/* ignore actual sysrq command char */
498
498
continue;
+1
-1
drivers/usb/serial/ftdi_sio.c
+1
-1
drivers/usb/serial/ftdi_sio.c
+4
-6
drivers/usb/serial/generic.c
+4
-6
drivers/usb/serial/generic.c
···
343
343
tty_insert_flip_string(tty, ch, urb->actual_length);
344
344
else {
345
345
for (i = 0; i < urb->actual_length; i++, ch++) {
346
-
if (!usb_serial_handle_sysrq_char(tty, port, *ch))
346
+
if (!usb_serial_handle_sysrq_char(port, *ch))
347
347
tty_insert_flip_char(tty, *ch, TTY_NORMAL);
348
348
}
349
349
}
···
448
448
EXPORT_SYMBOL_GPL(usb_serial_generic_unthrottle);
449
449
450
450
#ifdef CONFIG_MAGIC_SYSRQ
451
-
int usb_serial_handle_sysrq_char(struct tty_struct *tty,
452
-
struct usb_serial_port *port, unsigned int ch)
451
+
int usb_serial_handle_sysrq_char(struct usb_serial_port *port, unsigned int ch)
453
452
{
454
453
if (port->sysrq && port->port.console) {
455
454
if (ch && time_before(jiffies, port->sysrq)) {
456
-
handle_sysrq(ch, tty);
455
+
handle_sysrq(ch);
457
456
port->sysrq = 0;
458
457
return 1;
459
458
}
···
461
462
return 0;
462
463
}
463
464
#else
464
-
int usb_serial_handle_sysrq_char(struct tty_struct *tty,
465
-
struct usb_serial_port *port, unsigned int ch)
465
+
int usb_serial_handle_sysrq_char(struct usb_serial_port *port, unsigned int ch)
466
466
{
467
467
return 0;
468
468
}
+1
-1
drivers/usb/serial/pl2303.c
+1
-1
drivers/usb/serial/pl2303.c
···
789
789
790
790
if (port->port.console && port->sysrq) {
791
791
for (i = 0; i < urb->actual_length; ++i)
792
-
if (!usb_serial_handle_sysrq_char(tty, port, data[i]))
792
+
if (!usb_serial_handle_sysrq_char(port, data[i]))
793
793
tty_insert_flip_char(tty, data[i], tty_flag);
794
794
} else {
795
795
tty_insert_flip_string_fixed_flag(tty, data, tty_flag,
+1
-1
drivers/usb/serial/ssu100.c
+1
-1
drivers/usb/serial/ssu100.c
+1
-1
drivers/xen/manage.c
+1
-1
drivers/xen/manage.c
+1
include/linux/miscdevice.h
+1
include/linux/miscdevice.h
+1
-1
include/linux/serial_core.h
+1
-1
include/linux/serial_core.h
+9
-7
include/linux/sysrq.h
+9
-7
include/linux/sysrq.h
···
15
15
#define _LINUX_SYSRQ_H
16
16
17
17
#include <linux/errno.h>
18
-
19
-
struct pt_regs;
20
-
struct tty_struct;
18
+
#include <linux/types.h>
21
19
22
20
/* Possible values of bitmask for enabling sysrq functions */
23
21
/* 0x0001 is reserved for enable everything */
···
29
31
#define SYSRQ_ENABLE_RTNICE 0x0100
30
32
31
33
struct sysrq_key_op {
32
-
void (*handler)(int, struct tty_struct *);
34
+
void (*handler)(int);
33
35
char *help_msg;
34
36
char *action_msg;
35
37
int enable_mask;
···
42
44
* are available -- else NULL's).
43
45
*/
44
46
45
-
void handle_sysrq(int key, struct tty_struct *tty);
46
-
void __handle_sysrq(int key, struct tty_struct *tty, int check_mask);
47
+
void handle_sysrq(int key);
48
+
void __handle_sysrq(int key, bool check_mask);
47
49
int register_sysrq_key(int key, struct sysrq_key_op *op);
48
50
int unregister_sysrq_key(int key, struct sysrq_key_op *op);
49
51
struct sysrq_key_op *__sysrq_get_key_op(int key);
···
52
54
53
55
#else
54
56
55
-
static inline void handle_sysrq(int key, struct tty_struct *tty)
57
+
static inline void handle_sysrq(int key)
58
+
{
59
+
}
60
+
61
+
static inline void __handle_sysrq(int key, bool check_mask)
56
62
{
57
63
}
58
64
-1
include/linux/uinput.h
-1
include/linux/uinput.h
+1
-2
include/linux/usb/serial.h
+1
-2
include/linux/usb/serial.h
···
342
342
extern void usb_serial_generic_process_read_urb(struct urb *urb);
343
343
extern int usb_serial_generic_prepare_write_buffer(struct usb_serial_port *port,
344
344
void *dest, size_t size);
345
-
extern int usb_serial_handle_sysrq_char(struct tty_struct *tty,
346
-
struct usb_serial_port *port,
345
+
extern int usb_serial_handle_sysrq_char(struct usb_serial_port *port,
347
346
unsigned int ch);
348
347
extern int usb_serial_handle_break(struct usb_serial_port *port);
349
348
+1
-1
kernel/debug/debug_core.c
+1
-1
kernel/debug/debug_core.c
+1
-1
kernel/debug/kdb/kdb_main.c
+1
-1
kernel/debug/kdb/kdb_main.c
+1
-1
kernel/power/poweroff.c
+1
-1
kernel/power/poweroff.c
···
24
24
25
25
static DECLARE_WORK(poweroff_work, do_poweroff);
26
26
27
-
static void handle_poweroff(int key, struct tty_struct *tty)
27
+
static void handle_poweroff(int key)
28
28
{
29
29
/* run sysrq poweroff on boot cpu */
30
30
schedule_work_on(cpumask_first(cpu_online_mask), &poweroff_work);