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
106106 pr_info("Loglevel set to %d\n", i);
107107 console_loglevel = i;
108108 }
109−static struct sysrq_key_op sysrq_loglevel_op = {
109+static const struct sysrq_key_op sysrq_loglevel_op = {
110110 .handler = sysrq_handle_loglevel,
111111 .help_msg = "loglevel(0-9)",
112112 .action_msg = "Changing Loglevel",
@@ -119,14 +119,14 @@ static void sysrq_handle_SAK(int key) · 6 unmodified lines
119119 struct work_struct *SAK_work = &vc_cons[fg_console].SAK_work;
120120 schedule_work(SAK_work);
121121 }
122−static struct sysrq_key_op sysrq_SAK_op = {
122+static const struct sysrq_key_op sysrq_SAK_op = {
123123 .handler = sysrq_handle_SAK,
124124 .help_msg = "sak(k)",
125125 .action_msg = "SAK",
126126 .enable_mask = SYSRQ_ENABLE_KEYBOARD,
127127 };
128128 #else
129−#define sysrq_SAK_op (*(struct sysrq_key_op *)NULL)
129+#define sysrq_SAK_op (*(const struct sysrq_key_op *)NULL)
130130 #endif
131131
132132 #ifdef CONFIG_VT
@@ -135,14 +135,14 @@ static void sysrq_handle_unraw(int key) · 2 unmodified lines
135135 vt_reset_unicode(fg_console);
136136 }
137137
138−static struct sysrq_key_op sysrq_unraw_op = {
138+static const struct sysrq_key_op sysrq_unraw_op = {
139139 .handler = sysrq_handle_unraw,
140140 .help_msg = "unraw(r)",
141141 .action_msg = "Keyboard mode set to system default",
142142 .enable_mask = SYSRQ_ENABLE_KEYBOARD,
143143 };
144144 #else
145−#define sysrq_unraw_op (*(struct sysrq_key_op *)NULL)
145+#define sysrq_unraw_op (*(const struct sysrq_key_op *)NULL)
146146 #endif /* CONFIG_VT */
147147
148148 static void sysrq_handle_crash(int key)
@@ -152,7 +152,7 @@ static void sysrq_handle_crash(int key) · 3 unmodified lines
152152
153153 panic("sysrq triggered crash\n");
154154 }
155−static struct sysrq_key_op sysrq_crash_op = {
155+static const struct sysrq_key_op sysrq_crash_op = {
156156 .handler = sysrq_handle_crash,
157157 .help_msg = "crash(c)",
158158 .action_msg = "Trigger a crash",
@@ -165,20 +165,20 @@ static void sysrq_handle_reboot(int key) · 6 unmodified lines
165165 local_irq_enable();
166166 emergency_restart();
167167 }
168−static struct sysrq_key_op sysrq_reboot_op = {
168+static const struct sysrq_key_op sysrq_reboot_op = {
169169 .handler = sysrq_handle_reboot,
170170 .help_msg = "reboot(b)",
171171 .action_msg = "Resetting",
172172 .enable_mask = SYSRQ_ENABLE_BOOT,
173173 };
174174
175−struct sysrq_key_op *__sysrq_reboot_op = &sysrq_reboot_op;
175+const struct sysrq_key_op *__sysrq_reboot_op = &sysrq_reboot_op;
176176
177177 static void sysrq_handle_sync(int key)
178178 {
179179 emergency_sync();
180180 }
181−static struct sysrq_key_op sysrq_sync_op = {
181+static const struct sysrq_key_op sysrq_sync_op = {
182182 .handler = sysrq_handle_sync,
183183 .help_msg = "sync(s)",
184184 .action_msg = "Emergency Sync",
@@ -190,7 +190,7 @@ static void sysrq_handle_show_timers(int key) · 5 unmodified lines
190190 sysrq_timer_list_show();
191191 }
192192
193−static struct sysrq_key_op sysrq_show_timers_op = {
193+static const struct sysrq_key_op sysrq_show_timers_op = {
194194 .handler = sysrq_handle_show_timers,
195195 .help_msg = "show-all-timers(q)",
196196 .action_msg = "Show clockevent devices & pending hrtimers (no others)",
@@ -200,7 +200,7 @@ static void sysrq_handle_mountro(int key) · 3 unmodified lines
200200 {
201201 emergency_remount();
202202 }
203−static struct sysrq_key_op sysrq_mountro_op = {
203+static const struct sysrq_key_op sysrq_mountro_op = {
204204 .handler = sysrq_handle_mountro,
205205 .help_msg = "unmount(u)",
206206 .action_msg = "Emergency Remount R/O",
@@ -213,13 +213,13 @@ static void sysrq_handle_showlocks(int key) · 6 unmodified lines
213213 debug_show_all_locks();
214214 }
215215
216−static struct sysrq_key_op sysrq_showlocks_op = {
216+static const struct sysrq_key_op sysrq_showlocks_op = {
217217 .handler = sysrq_handle_showlocks,
218218 .help_msg = "show-all-locks(d)",
219219 .action_msg = "Show Locks Held",
220220 };
221221 #else
222−#define sysrq_showlocks_op (*(struct sysrq_key_op *)NULL)
222+#define sysrq_showlocks_op (*(const struct sysrq_key_op *)NULL)
223223 #endif
224224
225225 #ifdef CONFIG_SMP
@@ -266,7 +266,7 @@ static void sysrq_handle_showallcpus(int key) · 40 unmodified lines
266266 }
267267 }
268268
269−static struct sysrq_key_op sysrq_showallcpus_op = {
269+static const struct sysrq_key_op sysrq_showallcpus_op = {
270270 .handler = sysrq_handle_showallcpus,
271271 .help_msg = "show-backtrace-all-active-cpus(l)",
272272 .action_msg = "Show backtrace of all active CPUs",
@@ -284,7 +284,7 @@ static void sysrq_handle_showregs(int key) · 11 unmodified lines
284284 show_regs(regs);
285285 perf_event_print_debug();
286286 }
287−static struct sysrq_key_op sysrq_showregs_op = {
287+static const struct sysrq_key_op sysrq_showregs_op = {
288288 .handler = sysrq_handle_showregs,
289289 .help_msg = "show-registers(p)",
290290 .action_msg = "Show Regs",
@@ -296,7 +296,7 @@ static void sysrq_handle_showstate(int key) · 5 unmodified lines
296296 show_state();
297297 show_workqueue_state();
298298 }
299−static struct sysrq_key_op sysrq_showstate_op = {
299+static const struct sysrq_key_op sysrq_showstate_op = {
300300 .handler = sysrq_handle_showstate,
301301 .help_msg = "show-task-states(t)",
302302 .action_msg = "Show State",
@@ -307,7 +307,7 @@ static void sysrq_handle_showstate_blocked(int key) · 4 unmodified lines
307307 {
308308 show_state_filter(TASK_UNINTERRUPTIBLE);
309309 }
310−static struct sysrq_key_op sysrq_showstate_blocked_op = {
310+static const struct sysrq_key_op sysrq_showstate_blocked_op = {
311311 .handler = sysrq_handle_showstate_blocked,
312312 .help_msg = "show-blocked-tasks(w)",
313313 .action_msg = "Show Blocked State",
@@ -321,21 +321,21 @@ static void sysrq_ftrace_dump(int key) · 7 unmodified lines
321321 {
322322 ftrace_dump(DUMP_ALL);
323323 }
324−static struct sysrq_key_op sysrq_ftrace_dump_op = {
324+static const struct sysrq_key_op sysrq_ftrace_dump_op = {
325325 .handler = sysrq_ftrace_dump,
326326 .help_msg = "dump-ftrace-buffer(z)",
327327 .action_msg = "Dump ftrace buffer",
328328 .enable_mask = SYSRQ_ENABLE_DUMP,
329329 };
330330 #else
331−#define sysrq_ftrace_dump_op (*(struct sysrq_key_op *)NULL)
331+#define sysrq_ftrace_dump_op (*(const struct sysrq_key_op *)NULL)
332332 #endif
333333
334334 static void sysrq_handle_showmem(int key)
335335 {
336336 show_mem(0, NULL);
337337 }
338−static struct sysrq_key_op sysrq_showmem_op = {
338+static const struct sysrq_key_op sysrq_showmem_op = {
339339 .handler = sysrq_handle_showmem,
340340 .help_msg = "show-memory-usage(m)",
341341 .action_msg = "Show Memory",
@@ -366,7 +366,7 @@ static void sysrq_handle_term(int key) · 24 unmodified lines
366366 send_sig_all(SIGTERM);
367367 console_loglevel = CONSOLE_LOGLEVEL_DEBUG;
368368 }
369−static struct sysrq_key_op sysrq_term_op = {
369+static const struct sysrq_key_op sysrq_term_op = {
370370 .handler = sysrq_handle_term,
371371 .help_msg = "terminate-all-tasks(e)",
372372 .action_msg = "Terminate All Tasks",
@@ -396,7 +396,7 @@ static void sysrq_handle_moom(int key) · 23 unmodified lines
396396 {
397397 schedule_work(&moom_work);
398398 }
399−static struct sysrq_key_op sysrq_moom_op = {
399+static const struct sysrq_key_op sysrq_moom_op = {
400400 .handler = sysrq_handle_moom,
401401 .help_msg = "memory-full-oom-kill(f)",
402402 .action_msg = "Manual OOM execution",
@@ -408,7 +408,7 @@ static void sysrq_handle_thaw(int key) · 5 unmodified lines
408408 {
409409 emergency_thaw_all();
410410 }
411−static struct sysrq_key_op sysrq_thaw_op = {
411+static const struct sysrq_key_op sysrq_thaw_op = {
412412 .handler = sysrq_handle_thaw,
413413 .help_msg = "thaw-filesystems(j)",
414414 .action_msg = "Emergency Thaw of all frozen filesystems",
@@ -421,7 +421,7 @@ static void sysrq_handle_kill(int key) · 6 unmodified lines
421421 send_sig_all(SIGKILL);
422422 console_loglevel = CONSOLE_LOGLEVEL_DEBUG;
423423 }
424−static struct sysrq_key_op sysrq_kill_op = {
424+static const struct sysrq_key_op sysrq_kill_op = {
425425 .handler = sysrq_handle_kill,
426426 .help_msg = "kill-all-tasks(i)",
427427 .action_msg = "Kill All Tasks",
@@ -432,7 +432,7 @@ static void sysrq_handle_unrt(int key) · 4 unmodified lines
432432 {
433433 normalize_rt_tasks();
434434 }
435−static struct sysrq_key_op sysrq_unrt_op = {
435+static const struct sysrq_key_op sysrq_unrt_op = {
436436 .handler = sysrq_handle_unrt,
437437 .help_msg = "nice-all-RT-tasks(n)",
438438 .action_msg = "Nice All RT Tasks",
@@ -442,7 +442,7 @@ static struct sysrq_key_op sysrq_unrt_op = { · 3 unmodified lines
442442 /* Key Operations table and lock */
443443 static DEFINE_SPINLOCK(sysrq_key_table_lock);
444444
445−static struct sysrq_key_op *sysrq_key_table[36] = {
445+static const struct sysrq_key_op *sysrq_key_table[36] = {
446446 &sysrq_loglevel_op, /* 0 */
447447 &sysrq_loglevel_op, /* 1 */
448448 &sysrq_loglevel_op, /* 2 */
include/linux/sysrq.h+1−1
@@ -47,7 +47,7 @@ void handle_sysrq(int key); · 46 unmodified lines
4747 void __handle_sysrq(int key, bool check_mask);
4848 int register_sysrq_key(int key, const struct sysrq_key_op *op);
4949 int unregister_sysrq_key(int key, const struct sysrq_key_op *op);
50−extern struct sysrq_key_op *__sysrq_reboot_op;
50+extern const struct sysrq_key_op *__sysrq_reboot_op;
5151
5252 int sysrq_toggle_support(int enable_mask);
5353 int sysrq_mask(void);