Skip to contentSkip to conversation

alpha: Fix build around srm_sysrq_reboot_op

PATCH Applied Joerg Roedel 3 participants 3 messages Jun 11, 2020 – Jun 15, 2020 Alpha port

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 alpha: Fix build around srm_sysrq_reboot_op

From: Joerg Roedel <[email protected]>

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]>
Cc Guenter Roeck <[email protected]>
---
 arch/alpha/kernel/setup.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
arch/alpha/kernel/setup.c +6 -1
index f5c42a8fcf9c..53520f8cb904 100644
@@ -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,
Signature · 1 line
2.26.2
maintainer Applied
#1 lore raw
Quoted 7 lines · Joerg Roedel

From: Joerg Roedel <[email protected]>

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.

Quoted 5 lines
Fixes 0f1c9688a194 ("tty/sysrq: alpha: export and use __sysrq_get_key_op()")
Cc Emil Velikov <[email protected]>
Cc Guenter Roeck <[email protected]>

---

Thanks, applied.

#2 lore raw
In reply to Joerg Roedel

Hi all,

Quoted 11 lines · Joerg Roedel

From: Joerg Roedel <[email protected]>

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]>
Cc Guenter Roeck <[email protected]>

Just coming back from 10 offline days and retracing my testing ... Seems that I've copied the wrong .config.
So a follow-up `make arch/alpha/kernel/setup.o' did not build anything... yet the command was _successful_.

This is something that should be fixed IMHO - doing the same for drivers/ (for example drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.o) results in an obvious audible error.

That said, apologies for the issue. I'll be more thorough and carefully audit the build logs for future patches.

-Emil