mirror of
https://github.com/torvalds/linux.git
synced 2026-04-18 06:44:00 -04:00
tty/sysrq: alpha: export and use __sysrq_get_key_op()
Export a pointer to the sysrq_get_key_op(). This way we can cleanly unregister it, instead of the current solutions of modifuing it inplace. Since __sysrq_get_key_op() is no longer used externally, let's make it a static function. This patch will allow us to limit access to each and every sysrq op and constify the sysrq handling. Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Jiri Slaby <jslaby@suse.com> Cc: linux-kernel@vger.kernel.org Cc: Richard Henderson <rth@twiddle.net> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Cc: Matt Turner <mattst88@gmail.com> Cc: linux-alpha@vger.kernel.org Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Link: https://lore.kernel.org/r/20200513214351.2138580-1-emil.l.velikov@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
beca62c421
commit
0f1c9688a1
@@ -430,6 +430,15 @@ register_cpus(void)
|
||||
|
||||
arch_initcall(register_cpus);
|
||||
|
||||
#ifdef CONFIG_MAGIC_SYSRQ
|
||||
static struct sysrq_key_op srm_sysrq_reboot_op = {
|
||||
.handler = machine_halt,
|
||||
.help_msg = "reboot(b)",
|
||||
.action_msg = "Resetting",
|
||||
.enable_mask = SYSRQ_ENABLE_BOOT,
|
||||
};
|
||||
#endif
|
||||
|
||||
void __init
|
||||
setup_arch(char **cmdline_p)
|
||||
{
|
||||
@@ -550,8 +559,8 @@ setup_arch(char **cmdline_p)
|
||||
/* If we're using SRM, make sysrq-b halt back to the prom,
|
||||
not auto-reboot. */
|
||||
if (alpha_using_srm) {
|
||||
struct sysrq_key_op *op = __sysrq_get_key_op('b');
|
||||
op->handler = (void *) machine_halt;
|
||||
unregister_sysrq_key('b', __sysrq_reboot_op);
|
||||
register_sysrq_key('b', &srm_sysrq_reboot_op);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user