Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 2637d139fb9a1bd428a003b7671fda40a034854f

Authored by Linus Torvalds
2 parents 494e2fbe1f 288933c02b
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

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

Showing 31 changed files Side-by-side Diff

arch/arm/kernel/etm.c
Diff comments   View file @ 2637d13
... ... @@ -230,7 +230,7 @@
230 230 etb_lock(t);
231 231 }
232 232  
233   -static void sysrq_etm_dump(int key, struct tty_struct *tty)
  233 +static void sysrq_etm_dump(int key)
234 234 {
235 235 dev_dbg(tracer.dev, "Dumping ETB buffer\n");
236 236 etm_dump();
arch/ia64/hp/sim/simserial.c
Diff comments   View file @ 2637d13
... ... @@ -149,7 +149,7 @@
149 149 ch = ia64_ssc(0, 0, 0, 0,
150 150 SSC_GETCHAR);
151 151 while (!ch);
152   - handle_sysrq(ch, NULL);
  152 + handle_sysrq(ch);
153 153 }
154 154 #endif
155 155 seen_esc = 0;
arch/powerpc/xmon/xmon.c
Diff comments   View file @ 2637d13
... ... @@ -2880,15 +2880,14 @@
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",
arch/sparc/kernel/process_64.c
Diff comments   View file @ 2637d13
... ... @@ -303,7 +303,7 @@
303 303  
304 304 #ifdef CONFIG_MAGIC_SYSRQ
305 305  
306   -static void sysrq_handle_globreg(int key, struct tty_struct *tty)
  306 +static void sysrq_handle_globreg(int key)
307 307 {
308 308 arch_trigger_all_cpu_backtrace();
309 309 }
arch/um/drivers/mconsole_kern.c
Diff comments   View file @ 2637d13
... ... @@ -690,7 +690,7 @@
690 690 static void sysrq_proc(void *arg)
691 691 {
692 692 char *op = arg;
693   - handle_sysrq(*op, NULL);
  693 + handle_sysrq(*op);
694 694 }
695 695  
696 696 void mconsole_sysrq(struct mc_request *req)
drivers/char/hangcheck-timer.c
Diff comments   View file @ 2637d13
... ... @@ -159,7 +159,7 @@
159 159 if (hangcheck_dump_tasks) {
160 160 printk(KERN_CRIT "Hangcheck: Task state:\n");
161 161 #ifdef CONFIG_MAGIC_SYSRQ
162   - handle_sysrq('t', NULL);
  162 + handle_sysrq('t');
163 163 #endif /* CONFIG_MAGIC_SYSRQ */
164 164 }
165 165 if (hangcheck_reboot) {
drivers/char/hvc_console.c
Diff comments   View file @ 2637d13
... ... @@ -651,7 +651,7 @@
651 651 if (sysrq_pressed)
652 652 continue;
653 653 } else if (sysrq_pressed) {
654   - handle_sysrq(buf[i], tty);
  654 + handle_sysrq(buf[i]);
655 655 sysrq_pressed = 0;
656 656 continue;
657 657 }
... ... @@ -403,7 +403,7 @@
403 403 hp->sysrq = 1;
404 404 continue;
405 405 } else if (hp->sysrq) {
406   - handle_sysrq(c, hp->tty);
  406 + handle_sysrq(c);
407 407 hp->sysrq = 0;
408 408 continue;
409 409 }
drivers/char/sysrq.c
Diff comments   View file @ 2637d13
... ... @@ -18,7 +18,6 @@
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>
... ... @@ -76,7 +75,7 @@
76 75 __setup("sysrq_always_enabled", sysrq_always_enabled_setup);
77 76  
78 77  
79   -static void sysrq_handle_loglevel(int key, struct tty_struct *tty)
  78 +static void sysrq_handle_loglevel(int key)
80 79 {
81 80 int i;
82 81  
... ... @@ -93,7 +92,7 @@
93 92 };
94 93  
95 94 #ifdef CONFIG_VT
96   -static void sysrq_handle_SAK(int key, struct tty_struct *tty)
  95 +static void sysrq_handle_SAK(int key)
97 96 {
98 97 struct work_struct *SAK_work = &vc_cons[fg_console].SAK_work;
99 98 schedule_work(SAK_work);
... ... @@ -109,7 +108,7 @@
109 108 #endif
110 109  
111 110 #ifdef CONFIG_VT
112   -static void sysrq_handle_unraw(int key, struct tty_struct *tty)
  111 +static void sysrq_handle_unraw(int key)
113 112 {
114 113 struct kbd_struct *kbd = &kbd_table[fg_console];
115 114  
... ... @@ -126,7 +125,7 @@
126 125 #define sysrq_unraw_op (*(struct sysrq_key_op *)NULL)
127 126 #endif /* CONFIG_VT */
128 127  
129   -static void sysrq_handle_crash(int key, struct tty_struct *tty)
  128 +static void sysrq_handle_crash(int key)
130 129 {
131 130 char *killer = NULL;
132 131  
... ... @@ -141,7 +140,7 @@
141 140 .enable_mask = SYSRQ_ENABLE_DUMP,
142 141 };
143 142  
144   -static void sysrq_handle_reboot(int key, struct tty_struct *tty)
  143 +static void sysrq_handle_reboot(int key)
145 144 {
146 145 lockdep_off();
147 146 local_irq_enable();
... ... @@ -154,7 +153,7 @@
154 153 .enable_mask = SYSRQ_ENABLE_BOOT,
155 154 };
156 155  
157   -static void sysrq_handle_sync(int key, struct tty_struct *tty)
  156 +static void sysrq_handle_sync(int key)
158 157 {
159 158 emergency_sync();
160 159 }
... ... @@ -165,7 +164,7 @@
165 164 .enable_mask = SYSRQ_ENABLE_SYNC,
166 165 };
167 166  
168   -static void sysrq_handle_show_timers(int key, struct tty_struct *tty)
  167 +static void sysrq_handle_show_timers(int key)
169 168 {
170 169 sysrq_timer_list_show();
171 170 }
... ... @@ -176,7 +175,7 @@
176 175 .action_msg = "Show clockevent devices & pending hrtimers (no others)",
177 176 };
178 177  
179   -static void sysrq_handle_mountro(int key, struct tty_struct *tty)
  178 +static void sysrq_handle_mountro(int key)
180 179 {
181 180 emergency_remount();
182 181 }
... ... @@ -188,7 +187,7 @@
188 187 };
189 188  
190 189 #ifdef CONFIG_LOCKDEP
191   -static void sysrq_handle_showlocks(int key, struct tty_struct *tty)
  190 +static void sysrq_handle_showlocks(int key)
192 191 {
193 192 debug_show_all_locks();
194 193 }
... ... @@ -226,7 +225,7 @@
226 225  
227 226 static DECLARE_WORK(sysrq_showallcpus, sysrq_showregs_othercpus);
228 227  
229   -static void sysrq_handle_showallcpus(int key, struct tty_struct *tty)
  228 +static void sysrq_handle_showallcpus(int key)
230 229 {
231 230 /*
232 231 * Fall back to the workqueue based printing if the
... ... @@ -252,7 +251,7 @@
252 251 };
253 252 #endif
254 253  
255   -static void sysrq_handle_showregs(int key, struct tty_struct *tty)
  254 +static void sysrq_handle_showregs(int key)
256 255 {
257 256 struct pt_regs *regs = get_irq_regs();
258 257 if (regs)
... ... @@ -266,7 +265,7 @@
266 265 .enable_mask = SYSRQ_ENABLE_DUMP,
267 266 };
268 267  
269   -static void sysrq_handle_showstate(int key, struct tty_struct *tty)
  268 +static void sysrq_handle_showstate(int key)
270 269 {
271 270 show_state();
272 271 }
... ... @@ -277,7 +276,7 @@
277 276 .enable_mask = SYSRQ_ENABLE_DUMP,
278 277 };
279 278  
280   -static void sysrq_handle_showstate_blocked(int key, struct tty_struct *tty)
  279 +static void sysrq_handle_showstate_blocked(int key)
281 280 {
282 281 show_state_filter(TASK_UNINTERRUPTIBLE);
283 282 }
... ... @@ -291,7 +290,7 @@
291 290 #ifdef CONFIG_TRACING
292 291 #include <linux/ftrace.h>
293 292  
294   -static void sysrq_ftrace_dump(int key, struct tty_struct *tty)
  293 +static void sysrq_ftrace_dump(int key)
295 294 {
296 295 ftrace_dump(DUMP_ALL);
297 296 }
... ... @@ -305,7 +304,7 @@
305 304 #define sysrq_ftrace_dump_op (*(struct sysrq_key_op *)NULL)
306 305 #endif
307 306  
308   -static void sysrq_handle_showmem(int key, struct tty_struct *tty)
  307 +static void sysrq_handle_showmem(int key)
309 308 {
310 309 show_mem();
311 310 }
... ... @@ -330,7 +329,7 @@
330 329 }
331 330 }
332 331  
333   -static void sysrq_handle_term(int key, struct tty_struct *tty)
  332 +static void sysrq_handle_term(int key)
334 333 {
335 334 send_sig_all(SIGTERM);
336 335 console_loglevel = 8;
... ... @@ -349,7 +348,7 @@
349 348  
350 349 static DECLARE_WORK(moom_work, moom_callback);
351 350  
352   -static void sysrq_handle_moom(int key, struct tty_struct *tty)
  351 +static void sysrq_handle_moom(int key)
353 352 {
354 353 schedule_work(&moom_work);
355 354 }
... ... @@ -361,7 +360,7 @@
361 360 };
362 361  
363 362 #ifdef CONFIG_BLOCK
364   -static void sysrq_handle_thaw(int key, struct tty_struct *tty)
  363 +static void sysrq_handle_thaw(int key)
365 364 {
366 365 emergency_thaw_all();
367 366 }
... ... @@ -373,7 +372,7 @@
373 372 };
374 373 #endif
375 374  
376   -static void sysrq_handle_kill(int key, struct tty_struct *tty)
  375 +static void sysrq_handle_kill(int key)
377 376 {
378 377 send_sig_all(SIGKILL);
379 378 console_loglevel = 8;
... ... @@ -385,7 +384,7 @@
385 384 .enable_mask = SYSRQ_ENABLE_SIGNAL,
386 385 };
387 386  
388   -static void sysrq_handle_unrt(int key, struct tty_struct *tty)
  387 +static void sysrq_handle_unrt(int key)
389 388 {
390 389 normalize_rt_tasks();
391 390 }
... ... @@ -493,7 +492,7 @@
493 492 sysrq_key_table[i] = op_p;
494 493 }
495 494  
496   -void __handle_sysrq(int key, struct tty_struct *tty, int check_mask)
  495 +void __handle_sysrq(int key, bool check_mask)
497 496 {
498 497 struct sysrq_key_op *op_p;
499 498 int orig_log_level;
... ... @@ -520,7 +519,7 @@
520 519 if (!check_mask || sysrq_on_mask(op_p->enable_mask)) {
521 520 printk("%s\n", op_p->action_msg);
522 521 console_loglevel = orig_log_level;
523   - op_p->handler(key, tty);
  522 + op_p->handler(key);
524 523 } else {
525 524 printk("This sysrq operation is disabled.\n");
526 525 }
527 526  
... ... @@ -545,10 +544,10 @@
545 544 spin_unlock_irqrestore(&sysrq_key_table_lock, flags);
546 545 }
547 546  
548   -void handle_sysrq(int key, struct tty_struct *tty)
  547 +void handle_sysrq(int key)
549 548 {
550 549 if (sysrq_on())
551   - __handle_sysrq(key, tty, 1);
  550 + __handle_sysrq(key, true);
552 551 }
553 552 EXPORT_SYMBOL(handle_sysrq);
554 553  
... ... @@ -597,7 +596,7 @@
597 596  
598 597 default:
599 598 if (sysrq_down && value && value != 2)
600   - __handle_sysrq(sysrq_xlate[code], NULL, 1);
  599 + __handle_sysrq(sysrq_xlate[code], true);
601 600 break;
602 601 }
603 602  
... ... @@ -765,7 +764,7 @@
765 764  
766 765 if (get_user(c, buf))
767 766 return -EFAULT;
768   - __handle_sysrq(c, NULL, 0);
  767 + __handle_sysrq(c, false);
769 768 }
770 769  
771 770 return count;
drivers/gpu/drm/drm_fb_helper.c
Diff comments   View file @ 2637d13
... ... @@ -370,7 +370,7 @@
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 }
drivers/input/keyboard/hil_kbd.c
Diff comments   View file @ 2637d13
... ... @@ -232,13 +232,13 @@
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));
245 245  
246 246  
... ... @@ -388,11 +388,11 @@
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  
drivers/input/keyboard/pxa27x_keypad.c
Diff comments   View file @ 2637d13
... ... @@ -567,8 +567,6 @@
567 567 clk_put(keypad->clk);
568 568  
569 569 input_unregister_device(keypad->input_dev);
570   - input_free_device(keypad->input_dev);
571   -
572 570 iounmap(keypad->mmio_base);
573 571  
574 572 res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
drivers/input/misc/uinput.c
Diff comments   View file @ 2637d13
... ... @@ -811,6 +811,8 @@
811 811 .minor = UINPUT_MINOR,
812 812 .name = UINPUT_NAME,
813 813 };
  814 +MODULE_ALIAS_MISCDEV(UINPUT_MINOR);
  815 +MODULE_ALIAS("devname:" UINPUT_NAME);
814 816  
815 817 static int __init uinput_init(void)
816 818 {
drivers/input/mousedev.c
Diff comments   View file @ 2637d13
... ... @@ -138,8 +138,8 @@
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,8 +155,8 @@
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  
drivers/net/ibm_newemac/debug.c
Diff comments   View file @ 2637d13
... ... @@ -238,7 +238,7 @@
238 238 }
239 239  
240 240 #if defined(CONFIG_MAGIC_SYSRQ)
241   -static void emac_sysrq_handler(int key, struct tty_struct *tty)
  241 +static void emac_sysrq_handler(int key)
242 242 {
243 243 emac_dbg_dump_all();
244 244 }
drivers/s390/char/ctrlchar.c
Diff comments   View file @ 2637d13
... ... @@ -16,12 +16,11 @@
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);
... ... @@ -54,7 +53,6 @@
54 53 /* racy */
55 54 if (len == 3 && buf[1] == '-') {
56 55 ctrlchar_sysrq_key = buf[2];
57   - sysrq_tty = tty;
58 56 schedule_work(&ctrlchar_work);
59 57 return CTRLCHAR_SYSRQ;
60 58 }
drivers/s390/char/keyboard.c
Diff comments   View file @ 2637d13
... ... @@ -305,7 +305,7 @@
305 305 if (kbd->sysrq) {
306 306 if (kbd->sysrq == K(KT_LATIN, '-')) {
307 307 kbd->sysrq = 0;
308   - handle_sysrq(value, kbd->tty);
  308 + handle_sysrq(value);
309 309 return;
310 310 }
311 311 if (value == '-') {
drivers/serial/sn_console.c
Diff comments   View file @ 2637d13
... ... @@ -492,7 +492,7 @@
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;
drivers/usb/serial/ftdi_sio.c
Diff comments   View file @ 2637d13
... ... @@ -1834,7 +1834,7 @@
1834 1834  
1835 1835 if (port->port.console && port->sysrq) {
1836 1836 for (i = 0; i < len; i++, ch++) {
1837   - if (!usb_serial_handle_sysrq_char(tty, port, *ch))
  1837 + if (!usb_serial_handle_sysrq_char(port, *ch))
1838 1838 tty_insert_flip_char(tty, *ch, flag);
1839 1839 }
1840 1840 } else {
drivers/usb/serial/generic.c
Diff comments   View file @ 2637d13
... ... @@ -343,7 +343,7 @@
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 }
350 350  
... ... @@ -448,12 +448,11 @@
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 }
... ... @@ -462,8 +461,7 @@
462 461 return 0;
463 462 }
464 463 #else
465   -int usb_serial_handle_sysrq_char(struct tty_struct *tty,
466   - struct usb_serial_port *port, unsigned int ch)
  464 +int usb_serial_handle_sysrq_char(struct usb_serial_port *port, unsigned int ch)
467 465 {
468 466 return 0;
469 467 }
drivers/usb/serial/pl2303.c
Diff comments   View file @ 2637d13
... ... @@ -789,7 +789,7 @@
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,
drivers/usb/serial/ssu100.c
Diff comments   View file @ 2637d13
... ... @@ -672,7 +672,7 @@
672 672  
673 673 if (port->port.console && port->sysrq) {
674 674 for (i = 0; i < len; i++, ch++) {
675   - if (!usb_serial_handle_sysrq_char(tty, port, *ch))
  675 + if (!usb_serial_handle_sysrq_char(port, *ch))
676 676 tty_insert_flip_char(tty, *ch, flag);
677 677 }
678 678 } else
drivers/xen/manage.c
Diff comments   View file @ 2637d13
... ... @@ -237,7 +237,7 @@
237 237 goto again;
238 238  
239 239 if (sysrq_key != '\0')
240   - handle_sysrq(sysrq_key, NULL);
  240 + handle_sysrq(sysrq_key);
241 241 }
242 242  
243 243 static struct xenbus_watch sysrq_watch = {
include/linux/miscdevice.h
Diff comments   View file @ 2637d13
... ... @@ -33,6 +33,7 @@
33 33 #define MWAVE_MINOR 219 /* ACP/Mwave Modem */
34 34 #define MPT_MINOR 220
35 35 #define MPT2SAS_MINOR 221
  36 +#define UINPUT_MINOR 223
36 37 #define HPET_MINOR 228
37 38 #define FUSE_MINOR 229
38 39 #define KVM_MINOR 232
include/linux/serial_core.h
Diff comments   View file @ 2637d13
... ... @@ -465,7 +465,7 @@
465 465 #ifdef SUPPORT_SYSRQ
466 466 if (port->sysrq) {
467 467 if (ch && time_before(jiffies, port->sysrq)) {
468   - handle_sysrq(ch, port->state->port.tty);
  468 + handle_sysrq(ch);
469 469 port->sysrq = 0;
470 470 return 1;
471 471 }
include/linux/sysrq.h
Diff comments   View file @ 2637d13
... ... @@ -15,10 +15,8 @@
15 15 #define _LINUX_SYSRQ_H
16 16  
17 17 #include <linux/errno.h>
  18 +#include <linux/types.h>
18 19  
19   -struct pt_regs;
20   -struct tty_struct;
21   -
22 20 /* Possible values of bitmask for enabling sysrq functions */
23 21 /* 0x0001 is reserved for enable everything */
24 22 #define SYSRQ_ENABLE_LOG 0x0002
... ... @@ -31,7 +29,7 @@
31 29 #define SYSRQ_ENABLE_RTNICE 0x0100
32 30  
33 31 struct sysrq_key_op {
34   - void (*handler)(int, struct tty_struct *);
  32 + void (*handler)(int);
35 33 char *help_msg;
36 34 char *action_msg;
37 35 int enable_mask;
... ... @@ -44,8 +42,8 @@
44 42 * are available -- else NULL's).
45 43 */
46 44  
47   -void handle_sysrq(int key, struct tty_struct *tty);
48   -void __handle_sysrq(int key, struct tty_struct *tty, int check_mask);
  45 +void handle_sysrq(int key);
  46 +void __handle_sysrq(int key, bool check_mask);
49 47 int register_sysrq_key(int key, struct sysrq_key_op *op);
50 48 int unregister_sysrq_key(int key, struct sysrq_key_op *op);
51 49 struct sysrq_key_op *__sysrq_get_key_op(int key);
... ... @@ -54,7 +52,11 @@
54 52  
55 53 #else
56 54  
57   -static inline void handle_sysrq(int key, struct tty_struct *tty)
  55 +static inline void handle_sysrq(int key)
  56 +{
  57 +}
  58 +
  59 +static inline void __handle_sysrq(int key, bool check_mask)
58 60 {
59 61 }
60 62  
include/linux/uinput.h
Diff comments   View file @ 2637d13
... ... @@ -37,7 +37,6 @@
37 37 #define UINPUT_VERSION 3
38 38  
39 39 #ifdef __KERNEL__
40   -#define UINPUT_MINOR 223
41 40 #define UINPUT_NAME "uinput"
42 41 #define UINPUT_BUFFER_SIZE 16
43 42 #define UINPUT_NUM_REQUESTS 16
include/linux/usb/serial.h
Diff comments   View file @ 2637d13
... ... @@ -342,8 +342,7 @@
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  
kernel/debug/debug_core.c
Diff comments   View file @ 2637d13
... ... @@ -741,7 +741,7 @@
741 741 };
742 742  
743 743 #ifdef CONFIG_MAGIC_SYSRQ
744   -static void sysrq_handle_dbg(int key, struct tty_struct *tty)
  744 +static void sysrq_handle_dbg(int key)
745 745 {
746 746 if (!dbg_io_ops) {
747 747 printk(KERN_CRIT "ERROR: No KGDB I/O module available\n");
kernel/debug/kdb/kdb_main.c
Diff comments   View file @ 2637d13
... ... @@ -1929,7 +1929,7 @@
1929 1929 if (argc != 1)
1930 1930 return KDB_ARGCOUNT;
1931 1931 kdb_trap_printk++;
1932   - __handle_sysrq(*argv[1], NULL, 0);
  1932 + __handle_sysrq(*argv[1], false);
1933 1933 kdb_trap_printk--;
1934 1934  
1935 1935 return 0;
kernel/power/poweroff.c
Diff comments   View file @ 2637d13
... ... @@ -24,7 +24,7 @@
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);