* Re: [PATCH] alpha: Fix build around srm_sysrq_reboot_op
@ 2020-06-11 13:23 Guenter Roeck
0 siblings, 0 replies; 4+ messages in thread
From: Guenter Roeck @ 2020-06-11 13:23 UTC (permalink / raw)
To: Joerg Roedel
Cc: Richard Henderson, Ivan Kokshaysky, Linus Torvalds, linux-alpha,
linux-kernel, Joerg Roedel, Emil Velikov
On Thu, Jun 11, 2020 at 11:11:39AM +0200, Joerg Roedel wrote:
> From: Joerg Roedel <jroedel@suse.de>
>
> 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>
> Cc: Guenter Roeck <linux@roeck-us.net>
> Signed-off-by: Joerg Roedel <jroedel@suse.de>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Tested-by: Guenter Roeck <linux@roeck-us.net>
> ---
> arch/alpha/kernel/setup.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> 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,
> --
> 2.26.2
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] alpha: Fix build around srm_sysrq_reboot_op
@ 2020-06-11 9:11 Joerg Roedel
2020-06-13 0:29 ` Matt Turner
2020-06-15 19:47 ` Emil Velikov
0 siblings, 2 replies; 4+ messages in thread
From: Joerg Roedel @ 2020-06-11 9:11 UTC (permalink / raw)
To: Richard Henderson
Cc: Ivan Kokshaysky, Linus Torvalds, linux-alpha, linux-kernel,
Joerg Roedel, Emil Velikov, Guenter Roeck
From: Joerg Roedel <jroedel@suse.de>
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>
Cc: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
arch/alpha/kernel/setup.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
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,
--
2.26.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] alpha: Fix build around srm_sysrq_reboot_op
2020-06-11 9:11 Joerg Roedel
@ 2020-06-13 0:29 ` Matt Turner
2020-06-15 19:47 ` Emil Velikov
1 sibling, 0 replies; 4+ messages in thread
From: Matt Turner @ 2020-06-13 0:29 UTC (permalink / raw)
To: Joerg Roedel
Cc: Richard Henderson, Ivan Kokshaysky, Linus Torvalds, linux-alpha,
LKML, Joerg Roedel, Emil Velikov, Guenter Roeck
On Thu, Jun 11, 2020 at 2:14 AM Joerg Roedel <joro@8bytes.org> wrote:
>
> From: Joerg Roedel <jroedel@suse.de>
>
> 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>
> Cc: Guenter Roeck <linux@roeck-us.net>
> Signed-off-by: Joerg Roedel <jroedel@suse.de>
> ---
Thanks, applied.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] alpha: Fix build around srm_sysrq_reboot_op
2020-06-11 9:11 Joerg Roedel
2020-06-13 0:29 ` Matt Turner
@ 2020-06-15 19:47 ` Emil Velikov
1 sibling, 0 replies; 4+ messages in thread
From: Emil Velikov @ 2020-06-15 19:47 UTC (permalink / raw)
To: Joerg Roedel
Cc: Richard Henderson, Ivan Kokshaysky, Linus Torvalds, linux-alpha,
Linux-Kernel@Vger. Kernel. Org, Joerg Roedel, Guenter Roeck
Hi all,
On Thu, 11 Jun 2020 at 10:11, Joerg Roedel <joro@8bytes.org> wrote:
>
> From: Joerg Roedel <jroedel@suse.de>
>
> 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>
> Cc: Guenter Roeck <linux@roeck-us.net>
> Signed-off-by: Joerg Roedel <jroedel@suse.de>
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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-06-15 19:51 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-11 13:23 [PATCH] alpha: Fix build around srm_sysrq_reboot_op Guenter Roeck
-- strict thread matches above, loose matches on Subject: below --
2020-06-11 9:11 Joerg Roedel
2020-06-13 0:29 ` Matt Turner
2020-06-15 19:47 ` Emil Velikov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).