diff options
| author | Joerg Roedel <[email protected]> | 2020-06-11 11:11:39 +0200 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2020-06-12 17:43:18 -0700 |
| commit | 777747f634ba765085373f851e9c48dccb12ad52 (patch) | |
| tree | 86eb8964bbf51958ee1e5cbad9ac110276e05edd | |
| parent | 7812193ca88bcb6c7bddea61c8797e2d5a6df5bd (diff) | |
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 <[email protected]>
Reviewed-by: Guenter Roeck <[email protected]>
Tested-by: Guenter Roeck <[email protected]>
Signed-off-by: Joerg Roedel <[email protected]>
Signed-off-by: Matt Turner <[email protected]>
| -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 e6d8aad15b22..916e42d74a86 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, |