[PATCH] ARM: kprobes: Rename test-kprobes.ko to test-kprobes-arm.ko

[PATCH] ARM: kprobes: Rename test-kprobes.ko to test-kprobes-arm.ko

[Nathan Chancellor]

When scripts/modules-check.sh is fixed to normalize the module's name
like name-fix-token does in scripts/Makefile.lib before checking that it
is unique [1], there is an error due to lib/tests/test_kprobes.ko and
arch/arm/probes/kprobes/test-kprobes.ko having the same module name.

  error: the following would cause module name conflict:
    arch/arm/probes/kprobes/test-kprobes.ko
    lib/tests/test_kprobes.ko

  $ modinfo arch/arm/probes/kprobes/test-kprobes.ko lib/tests/test_kprobes.ko | grep name:
  filename:       arch/arm/probes/kprobes/test-kprobes.ko
  name:           test_kprobes
  filename:       lib/tests/test_kprobes.ko
  name:           test_kprobes

Rename arch/arm/probes/kprobes/test-kprobes.ko to test-kprobes-arm.ko to
make its module name unique and clear up the error.

Reported-by: Sasha Levin <sashal@kernel.org>
Closes: https://lore.kernel.org/20261108225808.1809266-1-sashal@kernel.org/
Link: https://lore.kernel.org/20261103110411.11698-1-info@daylightlinux.ch/ [1]
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
---
We would like to take [1] for 7.5 in kbuild-next, so we would appreciate
an ack to take this directly or a stable branch that we can pull in.
---
 arch/arm/probes/kprobes/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/probes/kprobes/Makefile b/arch/arm/probes/kprobes/Makefile
index 6159010dac4a..f909a47a01aa 100644
--- a/arch/arm/probes/kprobes/Makefile
+++ b/arch/arm/probes/kprobes/Makefile
@@ -3,14 +3,14 @@ KASAN_SANITIZE_actions-common.o := n
 KASAN_SANITIZE_actions-arm.o := n
 KASAN_SANITIZE_actions-thumb.o := n
 obj-$(CONFIG_KPROBES)		+= core.o actions-common.o checkers-common.o
-obj-$(CONFIG_ARM_KPROBES_TEST)	+= test-kprobes.o
-test-kprobes-objs		:= test-core.o
+obj-$(CONFIG_ARM_KPROBES_TEST)	+= test-kprobes-arm.o
+test-kprobes-arm-objs		:= test-core.o
 
 ifdef CONFIG_THUMB2_KERNEL
 obj-$(CONFIG_KPROBES)		+= actions-thumb.o checkers-thumb.o
-test-kprobes-objs		+= test-thumb.o
+test-kprobes-arm-objs		+= test-thumb.o
 else
 obj-$(CONFIG_KPROBES)		+= actions-arm.o checkers-arm.o
 obj-$(CONFIG_OPTPROBES)		+= opt-arm.o
-test-kprobes-objs		+= test-arm.o
+test-kprobes-arm-objs		+= test-arm.o
 endif

---
base-commit: 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4
base-tree: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git master
change-id: 20261109-arm-test-kprobes-rename-060d15e94621

Best regards,
--  
Cheers,
Nathan

Re: [PATCH] ARM: kprobes: Rename test-kprobes.ko to test-kprobes-arm.ko

[Nicolas Schier]

On Mon, Nov 09, 2026 at 01:46:42AM -0500, Nathan Chancellor wrote:
> When scripts/modules-check.sh is fixed to normalize the module's name
> like name-fix-token does in scripts/Makefile.lib before checking that it
> is unique [1], there is an error due to lib/tests/test_kprobes.ko and
> arch/arm/probes/kprobes/test-kprobes.ko having the same module name.
> 
>   error: the following would cause module name conflict:
>     arch/arm/probes/kprobes/test-kprobes.ko
>     lib/tests/test_kprobes.ko
> 
>   $ modinfo arch/arm/probes/kprobes/test-kprobes.ko lib/tests/test_kprobes.ko | grep name:
>   filename:       arch/arm/probes/kprobes/test-kprobes.ko
>   name:           test_kprobes
>   filename:       lib/tests/test_kprobes.ko
>   name:           test_kprobes
> 
> Rename arch/arm/probes/kprobes/test-kprobes.ko to test-kprobes-arm.ko to
> make its module name unique and clear up the error.
> 
> Reported-by: Sasha Levin <sashal@kernel.org>
> Closes: https://lore.kernel.org/20261108225808.1809266-1-sashal@kernel.org/
> Link: https://lore.kernel.org/20261103110411.11698-1-info@daylightlinux.ch/ [1]
> Signed-off-by: Nathan Chancellor <nathan@kernel.org>
> ---
> We would like to take [1] for 7.5 in kbuild-next, so we would appreciate
> an ack to take this directly or a stable branch that we can pull in.
> ---
>  arch/arm/probes/kprobes/Makefile | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 

Thanks!

Reviewed-by: Nicolas Schier <nsc@kernel.org>

-- 
Nicolas