diff options
author | Bjoern B. Brandenburg <bbb@cs.unc.edu> | 2009-05-02 12:45:29 -0400 |
---|---|---|
committer | Bjoern B. Brandenburg <bbb@cs.unc.edu> | 2009-05-02 12:45:29 -0400 |
commit | 238187ea81334233bdb22a502db17d46a42c98a5 (patch) | |
tree | c23a700a44fb35e9795de235d3717a87b58996f3 | |
parent | e8327a6d1a1df73efba8d1492f604a51bd6322c3 (diff) |
litmus core: fix sysrq registration
The letter 'q' is already taken in 2.6.24.
-rw-r--r-- | litmus/litmus.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/litmus/litmus.c b/litmus/litmus.c index 33ae0c3281..becc00069b 100644 --- a/litmus/litmus.c +++ b/litmus/litmus.c | |||
@@ -694,9 +694,11 @@ static void sysrq_handle_kill_rt_tasks(int key, struct tty_struct *tty) | |||
694 | 694 | ||
695 | static struct sysrq_key_op sysrq_kill_rt_tasks_op = { | 695 | static struct sysrq_key_op sysrq_kill_rt_tasks_op = { |
696 | .handler = sysrq_handle_kill_rt_tasks, | 696 | .handler = sysrq_handle_kill_rt_tasks, |
697 | .help_msg = "Quit-rt-tasks", | 697 | .help_msg = "quit-rt-tasks(X)", |
698 | .action_msg = "sent SIGKILL to all real-time tasks", | 698 | .action_msg = "sent SIGKILL to all LITMUS^RT real-time tasks", |
699 | }; | 699 | }; |
700 | |||
701 | |||
700 | #endif | 702 | #endif |
701 | 703 | ||
702 | static int proc_read_stats(char *page, char **start, | 704 | static int proc_read_stats(char *page, char **start, |
@@ -891,7 +893,7 @@ static int __init _init_litmus(void) | |||
891 | 893 | ||
892 | #ifdef CONFIG_MAGIC_SYSRQ | 894 | #ifdef CONFIG_MAGIC_SYSRQ |
893 | /* offer some debugging help */ | 895 | /* offer some debugging help */ |
894 | if (!register_sysrq_key('q', &sysrq_kill_rt_tasks_op)) | 896 | if (!register_sysrq_key('x', &sysrq_kill_rt_tasks_op)) |
895 | printk("Registered kill rt tasks magic sysrq.\n"); | 897 | printk("Registered kill rt tasks magic sysrq.\n"); |
896 | else | 898 | else |
897 | printk("Could not register kill rt tasks magic sysrq.\n"); | 899 | printk("Could not register kill rt tasks magic sysrq.\n"); |