Commit 364b5b7b1d793a7f98be55b6b154716dcae78dfc
1 parent
45d447406a
Exists in
master
and in
20 other branches
sysrq, intel_fb: fix sysrq g collision
Commit 79e539453b34e35f39299a899d263b0a1f1670bd introduced a regression where you cannot use sysrq 'g' to enter kgdb. The solution is to move the intel fb sysrq over to V for video instead of G for graphics. The SMP VOYAGER code to register for the sysrq-v is not anywhere to be found in the mainline kernel, so the comments in the code were cleaned up as well. This patch also cleans up the sysrq definitions for kgdb to make it generic for the kernel debugger, such that the sysrq 'g' can be used in the future to enter a gdbstub or another kernel debugger. Signed-off-by: Jason Wessel <jason.wessel@windriver.com> Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org> Acked-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Showing 3 changed files with 6 additions and 6 deletions Side-by-side Diff
drivers/char/sysrq.c
| ... | ... | @@ -406,7 +406,7 @@ |
| 406 | 406 | &sysrq_showlocks_op, /* d */ |
| 407 | 407 | &sysrq_term_op, /* e */ |
| 408 | 408 | &sysrq_moom_op, /* f */ |
| 409 | - /* g: May be registered by ppc for kgdb */ | |
| 409 | + /* g: May be registered for the kernel debugger */ | |
| 410 | 410 | NULL, /* g */ |
| 411 | 411 | NULL, /* h - reserved for help */ |
| 412 | 412 | &sysrq_kill_op, /* i */ |
| ... | ... | @@ -431,7 +431,7 @@ |
| 431 | 431 | &sysrq_sync_op, /* s */ |
| 432 | 432 | &sysrq_showstate_op, /* t */ |
| 433 | 433 | &sysrq_mountro_op, /* u */ |
| 434 | - /* v: May be registered at init time by SMP VOYAGER */ | |
| 434 | + /* v: May be registered for frame buffer console restore */ | |
| 435 | 435 | NULL, /* v */ |
| 436 | 436 | &sysrq_showstate_blocked_op, /* w */ |
| 437 | 437 | /* x: May be registered on ppc/powerpc for xmon */ |
drivers/gpu/drm/i915/intel_fb.c
| ... | ... | @@ -864,7 +864,7 @@ |
| 864 | 864 | |
| 865 | 865 | static struct sysrq_key_op sysrq_intelfb_restore_op = { |
| 866 | 866 | .handler = intelfb_sysrq, |
| 867 | - .help_msg = "force-fb(G)", | |
| 867 | + .help_msg = "force-fb(V)", | |
| 868 | 868 | .action_msg = "Restore framebuffer console", |
| 869 | 869 | }; |
| 870 | 870 | |
| ... | ... | @@ -898,7 +898,7 @@ |
| 898 | 898 | ret = intelfb_single_fb_probe(dev); |
| 899 | 899 | } |
| 900 | 900 | |
| 901 | - register_sysrq_key('g', &sysrq_intelfb_restore_op); | |
| 901 | + register_sysrq_key('v', &sysrq_intelfb_restore_op); | |
| 902 | 902 | |
| 903 | 903 | return ret; |
| 904 | 904 | } |
kernel/kgdb.c