History

tty/sysrq: constify the the sysrq_key_op(s)

All the users threat them as immutable - annotate them as such.

Emil Velikov committed 6 years ago

Commit 7fffe311 parent 23cbedf2 files · +27 −27Browse files

Unified · Split

2 files
  1. drivers/tty/sysrq.c +26 −26
  2. include/linux/sysrq.h +1 −1
drivers/tty/sysrq.c+26−26
@@ -106,7 +106,7 @@ static void sysrq_handle_loglevel(int key) · 105 unmodified lines
106 pr_info("Loglevel set to %d\n", i);106 pr_info("Loglevel set to %d\n", i);
107 console_loglevel = i;107 console_loglevel = i;
108}108}
109static struct sysrq_key_op sysrq_loglevel_op = {109static const struct sysrq_key_op sysrq_loglevel_op = {
110 .handler = sysrq_handle_loglevel,110 .handler = sysrq_handle_loglevel,
111 .help_msg = "loglevel(0-9)",111 .help_msg = "loglevel(0-9)",
112 .action_msg = "Changing Loglevel",112 .action_msg = "Changing Loglevel",
@@ -119,14 +119,14 @@ static void sysrq_handle_SAK(int key) · 6 unmodified lines
119 struct work_struct *SAK_work = &vc_cons[fg_console].SAK_work;119 struct work_struct *SAK_work = &vc_cons[fg_console].SAK_work;
120 schedule_work(SAK_work);120 schedule_work(SAK_work);
121}121}
122static struct sysrq_key_op sysrq_SAK_op = {122static const struct sysrq_key_op sysrq_SAK_op = {
123 .handler = sysrq_handle_SAK,123 .handler = sysrq_handle_SAK,
124 .help_msg = "sak(k)",124 .help_msg = "sak(k)",
125 .action_msg = "SAK",125 .action_msg = "SAK",
126 .enable_mask = SYSRQ_ENABLE_KEYBOARD,126 .enable_mask = SYSRQ_ENABLE_KEYBOARD,
127};127};
128#else128#else
129#define sysrq_SAK_op (*(struct sysrq_key_op *)NULL)129#define sysrq_SAK_op (*(const struct sysrq_key_op *)NULL)
130#endif130#endif
131 131
132#ifdef CONFIG_VT132#ifdef CONFIG_VT
@@ -135,14 +135,14 @@ static void sysrq_handle_unraw(int key) · 2 unmodified lines
135 vt_reset_unicode(fg_console);135 vt_reset_unicode(fg_console);
136}136}
137 137
138static struct sysrq_key_op sysrq_unraw_op = {138static const struct sysrq_key_op sysrq_unraw_op = {
139 .handler = sysrq_handle_unraw,139 .handler = sysrq_handle_unraw,
140 .help_msg = "unraw(r)",140 .help_msg = "unraw(r)",
141 .action_msg = "Keyboard mode set to system default",141 .action_msg = "Keyboard mode set to system default",
142 .enable_mask = SYSRQ_ENABLE_KEYBOARD,142 .enable_mask = SYSRQ_ENABLE_KEYBOARD,
143};143};
144#else144#else
145#define sysrq_unraw_op (*(struct sysrq_key_op *)NULL)145#define sysrq_unraw_op (*(const struct sysrq_key_op *)NULL)
146#endif /* CONFIG_VT */146#endif /* CONFIG_VT */
147 147
148static void sysrq_handle_crash(int key)148static void sysrq_handle_crash(int key)
@@ -152,7 +152,7 @@ static void sysrq_handle_crash(int key) · 3 unmodified lines
152 152
153 panic("sysrq triggered crash\n");153 panic("sysrq triggered crash\n");
154}154}
155static struct sysrq_key_op sysrq_crash_op = {155static const struct sysrq_key_op sysrq_crash_op = {
156 .handler = sysrq_handle_crash,156 .handler = sysrq_handle_crash,
157 .help_msg = "crash(c)",157 .help_msg = "crash(c)",
158 .action_msg = "Trigger a crash",158 .action_msg = "Trigger a crash",
@@ -165,20 +165,20 @@ static void sysrq_handle_reboot(int key) · 6 unmodified lines
165 local_irq_enable();165 local_irq_enable();
166 emergency_restart();166 emergency_restart();
167}167}
168static struct sysrq_key_op sysrq_reboot_op = {168static const struct sysrq_key_op sysrq_reboot_op = {
169 .handler = sysrq_handle_reboot,169 .handler = sysrq_handle_reboot,
170 .help_msg = "reboot(b)",170 .help_msg = "reboot(b)",
171 .action_msg = "Resetting",171 .action_msg = "Resetting",
172 .enable_mask = SYSRQ_ENABLE_BOOT,172 .enable_mask = SYSRQ_ENABLE_BOOT,
173};173};
174 174
175struct sysrq_key_op *__sysrq_reboot_op = &sysrq_reboot_op;175const struct sysrq_key_op *__sysrq_reboot_op = &sysrq_reboot_op;
176 176
177static void sysrq_handle_sync(int key)177static void sysrq_handle_sync(int key)
178{178{
179 emergency_sync();179 emergency_sync();
180}180}
181static struct sysrq_key_op sysrq_sync_op = {181static const struct sysrq_key_op sysrq_sync_op = {
182 .handler = sysrq_handle_sync,182 .handler = sysrq_handle_sync,
183 .help_msg = "sync(s)",183 .help_msg = "sync(s)",
184 .action_msg = "Emergency Sync",184 .action_msg = "Emergency Sync",
@@ -190,7 +190,7 @@ static void sysrq_handle_show_timers(int key) · 5 unmodified lines
190 sysrq_timer_list_show();190 sysrq_timer_list_show();
191}191}
192 192
193static struct sysrq_key_op sysrq_show_timers_op = {193static const struct sysrq_key_op sysrq_show_timers_op = {
194 .handler = sysrq_handle_show_timers,194 .handler = sysrq_handle_show_timers,
195 .help_msg = "show-all-timers(q)",195 .help_msg = "show-all-timers(q)",
196 .action_msg = "Show clockevent devices & pending hrtimers (no others)",196 .action_msg = "Show clockevent devices & pending hrtimers (no others)",
@@ -200,7 +200,7 @@ static void sysrq_handle_mountro(int key) · 3 unmodified lines
200{200{
201 emergency_remount();201 emergency_remount();
202}202}
203static struct sysrq_key_op sysrq_mountro_op = {203static const struct sysrq_key_op sysrq_mountro_op = {
204 .handler = sysrq_handle_mountro,204 .handler = sysrq_handle_mountro,
205 .help_msg = "unmount(u)",205 .help_msg = "unmount(u)",
206 .action_msg = "Emergency Remount R/O",206 .action_msg = "Emergency Remount R/O",
@@ -213,13 +213,13 @@ static void sysrq_handle_showlocks(int key) · 6 unmodified lines
213 debug_show_all_locks();213 debug_show_all_locks();
214}214}
215 215
216static struct sysrq_key_op sysrq_showlocks_op = {216static const struct sysrq_key_op sysrq_showlocks_op = {
217 .handler = sysrq_handle_showlocks,217 .handler = sysrq_handle_showlocks,
218 .help_msg = "show-all-locks(d)",218 .help_msg = "show-all-locks(d)",
219 .action_msg = "Show Locks Held",219 .action_msg = "Show Locks Held",
220};220};
221#else221#else
222#define sysrq_showlocks_op (*(struct sysrq_key_op *)NULL)222#define sysrq_showlocks_op (*(const struct sysrq_key_op *)NULL)
223#endif223#endif
224 224
225#ifdef CONFIG_SMP225#ifdef CONFIG_SMP
@@ -266,7 +266,7 @@ static void sysrq_handle_showallcpus(int key) · 40 unmodified lines
266 }266 }
267}267}
268 268
269static struct sysrq_key_op sysrq_showallcpus_op = {269static const struct sysrq_key_op sysrq_showallcpus_op = {
270 .handler = sysrq_handle_showallcpus,270 .handler = sysrq_handle_showallcpus,
271 .help_msg = "show-backtrace-all-active-cpus(l)",271 .help_msg = "show-backtrace-all-active-cpus(l)",
272 .action_msg = "Show backtrace of all active CPUs",272 .action_msg = "Show backtrace of all active CPUs",
@@ -284,7 +284,7 @@ static void sysrq_handle_showregs(int key) · 11 unmodified lines
284 show_regs(regs);284 show_regs(regs);
285 perf_event_print_debug();285 perf_event_print_debug();
286}286}
287static struct sysrq_key_op sysrq_showregs_op = {287static const struct sysrq_key_op sysrq_showregs_op = {
288 .handler = sysrq_handle_showregs,288 .handler = sysrq_handle_showregs,
289 .help_msg = "show-registers(p)",289 .help_msg = "show-registers(p)",
290 .action_msg = "Show Regs",290 .action_msg = "Show Regs",
@@ -296,7 +296,7 @@ static void sysrq_handle_showstate(int key) · 5 unmodified lines
296 show_state();296 show_state();
297 show_workqueue_state();297 show_workqueue_state();
298}298}
299static struct sysrq_key_op sysrq_showstate_op = {299static const struct sysrq_key_op sysrq_showstate_op = {
300 .handler = sysrq_handle_showstate,300 .handler = sysrq_handle_showstate,
301 .help_msg = "show-task-states(t)",301 .help_msg = "show-task-states(t)",
302 .action_msg = "Show State",302 .action_msg = "Show State",
@@ -307,7 +307,7 @@ static void sysrq_handle_showstate_blocked(int key) · 4 unmodified lines
307{307{
308 show_state_filter(TASK_UNINTERRUPTIBLE);308 show_state_filter(TASK_UNINTERRUPTIBLE);
309}309}
310static struct sysrq_key_op sysrq_showstate_blocked_op = {310static const struct sysrq_key_op sysrq_showstate_blocked_op = {
311 .handler = sysrq_handle_showstate_blocked,311 .handler = sysrq_handle_showstate_blocked,
312 .help_msg = "show-blocked-tasks(w)",312 .help_msg = "show-blocked-tasks(w)",
313 .action_msg = "Show Blocked State",313 .action_msg = "Show Blocked State",
@@ -321,21 +321,21 @@ static void sysrq_ftrace_dump(int key) · 7 unmodified lines
321{321{
322 ftrace_dump(DUMP_ALL);322 ftrace_dump(DUMP_ALL);
323}323}
324static struct sysrq_key_op sysrq_ftrace_dump_op = {324static const struct sysrq_key_op sysrq_ftrace_dump_op = {
325 .handler = sysrq_ftrace_dump,325 .handler = sysrq_ftrace_dump,
326 .help_msg = "dump-ftrace-buffer(z)",326 .help_msg = "dump-ftrace-buffer(z)",
327 .action_msg = "Dump ftrace buffer",327 .action_msg = "Dump ftrace buffer",
328 .enable_mask = SYSRQ_ENABLE_DUMP,328 .enable_mask = SYSRQ_ENABLE_DUMP,
329};329};
330#else330#else
331#define sysrq_ftrace_dump_op (*(struct sysrq_key_op *)NULL)331#define sysrq_ftrace_dump_op (*(const struct sysrq_key_op *)NULL)
332#endif332#endif
333 333
334static void sysrq_handle_showmem(int key)334static void sysrq_handle_showmem(int key)
335{335{
336 show_mem(0, NULL);336 show_mem(0, NULL);
337}337}
338static struct sysrq_key_op sysrq_showmem_op = {338static const struct sysrq_key_op sysrq_showmem_op = {
339 .handler = sysrq_handle_showmem,339 .handler = sysrq_handle_showmem,
340 .help_msg = "show-memory-usage(m)",340 .help_msg = "show-memory-usage(m)",
341 .action_msg = "Show Memory",341 .action_msg = "Show Memory",
@@ -366,7 +366,7 @@ static void sysrq_handle_term(int key) · 24 unmodified lines
366 send_sig_all(SIGTERM);366 send_sig_all(SIGTERM);
367 console_loglevel = CONSOLE_LOGLEVEL_DEBUG;367 console_loglevel = CONSOLE_LOGLEVEL_DEBUG;
368}368}
369static struct sysrq_key_op sysrq_term_op = {369static const struct sysrq_key_op sysrq_term_op = {
370 .handler = sysrq_handle_term,370 .handler = sysrq_handle_term,
371 .help_msg = "terminate-all-tasks(e)",371 .help_msg = "terminate-all-tasks(e)",
372 .action_msg = "Terminate All Tasks",372 .action_msg = "Terminate All Tasks",
@@ -396,7 +396,7 @@ static void sysrq_handle_moom(int key) · 23 unmodified lines
396{396{
397 schedule_work(&moom_work);397 schedule_work(&moom_work);
398}398}
399static struct sysrq_key_op sysrq_moom_op = {399static const struct sysrq_key_op sysrq_moom_op = {
400 .handler = sysrq_handle_moom,400 .handler = sysrq_handle_moom,
401 .help_msg = "memory-full-oom-kill(f)",401 .help_msg = "memory-full-oom-kill(f)",
402 .action_msg = "Manual OOM execution",402 .action_msg = "Manual OOM execution",
@@ -408,7 +408,7 @@ static void sysrq_handle_thaw(int key) · 5 unmodified lines
408{408{
409 emergency_thaw_all();409 emergency_thaw_all();
410}410}
411static struct sysrq_key_op sysrq_thaw_op = {411static const struct sysrq_key_op sysrq_thaw_op = {
412 .handler = sysrq_handle_thaw,412 .handler = sysrq_handle_thaw,
413 .help_msg = "thaw-filesystems(j)",413 .help_msg = "thaw-filesystems(j)",
414 .action_msg = "Emergency Thaw of all frozen filesystems",414 .action_msg = "Emergency Thaw of all frozen filesystems",
@@ -421,7 +421,7 @@ static void sysrq_handle_kill(int key) · 6 unmodified lines
421 send_sig_all(SIGKILL);421 send_sig_all(SIGKILL);
422 console_loglevel = CONSOLE_LOGLEVEL_DEBUG;422 console_loglevel = CONSOLE_LOGLEVEL_DEBUG;
423}423}
424static struct sysrq_key_op sysrq_kill_op = {424static const struct sysrq_key_op sysrq_kill_op = {
425 .handler = sysrq_handle_kill,425 .handler = sysrq_handle_kill,
426 .help_msg = "kill-all-tasks(i)",426 .help_msg = "kill-all-tasks(i)",
427 .action_msg = "Kill All Tasks",427 .action_msg = "Kill All Tasks",
@@ -432,7 +432,7 @@ static void sysrq_handle_unrt(int key) · 4 unmodified lines
432{432{
433 normalize_rt_tasks();433 normalize_rt_tasks();
434}434}
435static struct sysrq_key_op sysrq_unrt_op = {435static const struct sysrq_key_op sysrq_unrt_op = {
436 .handler = sysrq_handle_unrt,436 .handler = sysrq_handle_unrt,
437 .help_msg = "nice-all-RT-tasks(n)",437 .help_msg = "nice-all-RT-tasks(n)",
438 .action_msg = "Nice All RT Tasks",438 .action_msg = "Nice All RT Tasks",
@@ -442,7 +442,7 @@ static struct sysrq_key_op sysrq_unrt_op = { · 3 unmodified lines
442/* Key Operations table and lock */442/* Key Operations table and lock */
443static DEFINE_SPINLOCK(sysrq_key_table_lock);443static DEFINE_SPINLOCK(sysrq_key_table_lock);
444 444
445static struct sysrq_key_op *sysrq_key_table[36] = {445static const struct sysrq_key_op *sysrq_key_table[36] = {
446 &sysrq_loglevel_op, /* 0 */446 &sysrq_loglevel_op, /* 0 */
447 &sysrq_loglevel_op, /* 1 */447 &sysrq_loglevel_op, /* 1 */
448 &sysrq_loglevel_op, /* 2 */448 &sysrq_loglevel_op, /* 2 */
include/linux/sysrq.h+1−1
@@ -47,7 +47,7 @@ void handle_sysrq(int key); · 46 unmodified lines
47void __handle_sysrq(int key, bool check_mask);47void __handle_sysrq(int key, bool check_mask);
48int register_sysrq_key(int key, const struct sysrq_key_op *op);48int register_sysrq_key(int key, const struct sysrq_key_op *op);
49int unregister_sysrq_key(int key, const struct sysrq_key_op *op);49int unregister_sysrq_key(int key, const struct sysrq_key_op *op);
50extern struct sysrq_key_op *__sysrq_reboot_op;50extern const struct sysrq_key_op *__sysrq_reboot_op;
51 51
52int sysrq_toggle_support(int enable_mask);52int sysrq_toggle_support(int enable_mask);
53int sysrq_mask(void);53int sysrq_mask(void);