diff options
| author | Joerg Roedel <jroedel@suse.de> | 2020-06-11 11:11:39 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-11 22:05:24 +0200 |
| commit | 5cd221e837d6fe2a4d284360581be3fdcbf79734 (patch) | |
| tree | a3a5880ffdf2d5dd6489bd30e81a2ca00c616709 | |
| parent | Merge tag 'riscv-for-linus-5.8-mw1' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| download | linux-5cd221e837d6fe2a4d284360581be3fdcbf79734.tar.xz linux-5cd221e837d6fe2a4d284360581be3fdcbf79734.zip | |
alpha: Fix build around srm_sysrq_reboot_op
The patch introducing the struct was probably never compile tested,
because it sets a handler with a wrong function signature. Wrap the
handler into a functions with the correct signature to fix the build.
Fixes: 0f1c9688a194 ("tty/sysrq: alpha: export and use __sysrq_get_key_op()")
Cc: Emil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Tested-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to '')
| -rw-r--r-- | arch/alpha/kernel/setup.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/alpha/kernel/setup.c b/arch/alpha/kernel/setup.c index f5c42a8fcf9c..53520f8cb904 100644 --- a/arch/alpha/kernel/setup.c +++ b/arch/alpha/kernel/setup.c @@ -430,8 +430,13 @@ register_cpus(void) arch_initcall(register_cpus); #ifdef CONFIG_MAGIC_SYSRQ +static void sysrq_reboot_handler(int unused) +{ + machine_halt(); +} + static const struct sysrq_key_op srm_sysrq_reboot_op = { - .handler = machine_halt, + .handler = sysrq_reboot_handler, .help_msg = "reboot(b)", .action_msg = "Resetting", .enable_mask = SYSRQ_ENABLE_BOOT, |