This is a note to let you know that I've just added the patch titled
ARM: 9139/1: kprobes: fix arch_init_kprobes() prototype
to the 5.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
arm-9139-1-kprobes-fix-arch_init_kprobes-prototype.patch
and it can be found in the queue-5.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 1f323127cab086e4fd618981b1e5edc396eaf0f4 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@xxxxxxxx>
Date: Mon, 18 Oct 2021 15:30:09 +0100
Subject: ARM: 9139/1: kprobes: fix arch_init_kprobes() prototype
From: Arnd Bergmann <arnd@xxxxxxxx>
commit 1f323127cab086e4fd618981b1e5edc396eaf0f4 upstream.
With extra warnings enabled, gcc complains about this function
definition:
arch/arm/probes/kprobes/core.c: In function 'arch_init_kprobes':
arch/arm/probes/kprobes/core.c:465:12: warning: old-style function definition [-Wold-style-definition]
465 | int __init arch_init_kprobes()
Link: https://lore.kernel.org/all/20201027093057.c685a14b386acacb3c449e3d@xxxxxxxxxx/
Fixes: 24ba613c9d6c ("ARM kprobes: core code")
Acked-by: Masami Hiramatsu <mhiramat@xxxxxxxxxx>
Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
Signed-off-by: Russell King (Oracle) <rmk+kernel@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/arm/probes/kprobes/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/arch/arm/probes/kprobes/core.c
+++ b/arch/arm/probes/kprobes/core.c
@@ -439,7 +439,7 @@ static struct undef_hook kprobes_arm_bre
#endif /* !CONFIG_THUMB2_KERNEL */
-int __init arch_init_kprobes()
+int __init arch_init_kprobes(void)
{
arm_probes_decode_init();
#ifdef CONFIG_THUMB2_KERNEL
Patches currently in stable-queue which might be from arnd@xxxxxxxx are
queue-5.14/arm-9138-1-fix-link-warning-with-xip-frame-pointer.patch
queue-5.14/arm-9141-1-only-warn-about-xip-address-when-not-compile-testing.patch
queue-5.14/arm-9134-1-remove-duplicate-memcpy-definition.patch
queue-5.14/arm-9139-1-kprobes-fix-arch_init_kprobes-prototype.patch
