Re: [REGRESSION] stable-rt/v6 .6-rt: (build) conflicting types for ‘check_u naligned_access’; have ‘int(void *)’...

Sebastian Andrzej Siewior <[email protected]> Tue, 17 Jun 2025 09:44:00 +0200
Newsgroups dev.linux.lists.kernelci,dev.linux.lists.linux-rt-devel
Message-ID <[email protected]>
On 2025-06-16 23:59:03 [-0400], KernelCI bot wrote:
> Hello,
Hi,

> New build issue found on stable-rt/v6.6-rt:
> 
> ---
>  conflicting types for ‘check_unaligned_access’; have ‘int(void *)’ in
> arch/riscv/kernel/cpufeature.o (arch/riscv/kernel/cpufeature.c)
> [logspec:kbuild,kbuild.compiler.error]
> ---
> 
> - dashboard: https://d.kernelci.org/i/maestro:09fe4370872596f20cdca497ccf7239e25067afa
> - giturl: https://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-stable-rt.git
> - commit HEAD:  5495197730f86d3227ddfc243ff2980747a321ff
> 
> 
> Log excerpt:
> =====================================================
> arch/riscv/kernel/cpufeature.c:580:12: error: conflicting types for
> ‘check_unaligned_access’; have ‘int(void *)’
>   580 | static int check_unaligned_access(void *param)
>       |            ^~~~~~~~~~~~~~~~~~~~~~
> In file included from ./arch/riscv/include/asm/hwcap.h:73,
…
> #kernelci issue maestro:09fe4370872596f20cdca497ccf7239e25067afa
> 
> Reported-by: kernelci.org bot <[email protected]>

Oh this makes me happy. Well, it does not build, yes, but the bot
noticed it and reported it. So this counts.

On the productive side:

This was introduced by commit 502f0a5eb68b8 ("Merge tag 'v6.6.84' into
v6.6-rt") noting a conflict in arch/riscv/include/asm/cpufeature.h.

The prototype should be removed:

diff --git a/arch/riscv/include/asm/cpufeature.h b/arch/riscv/include/asm/cpufeature.h
index 13b7d35648a9c..788fd575c21a9 100644
--- a/arch/riscv/include/asm/cpufeature.h
+++ b/arch/riscv/include/asm/cpufeature.h
@@ -30,7 +30,6 @@ DECLARE_PER_CPU(long, misaligned_access_speed);
 /* Per-cpu ISA extensions. */
 extern struct riscv_isainfo hart_isa[NR_CPUS];
 
-void check_unaligned_access(int cpu);
 void riscv_user_isa_enable(void);
 
 #endif

This happened in the upstream commit 55e0bf49a0d03 ("RISC-V: Probe
misaligned access speed in parallel")

Sebastian