From f57cd571b638cad6bc1286a265db89d37dae0a6b Mon Sep 17 00:00:00 2001 From: Sebastian Andrzej Siewior Date: Mon, 5 Aug 2024 09:48:12 -0500 Subject: [PATCH 199/204] riscv: Add return value to check_unaligned_access(). The stable backport of commit c20d36cc2a207 ("riscv: don't probe unaligned access speed if already done") added a `return' stament to check_unaligned_access(). The return value of the function is `void' but the RT tree has the backport of commit 73cf6167ef44c ("RISC-V: Probe misaligned access speed in parallel") which changes the return type to `int'. Make the return statement return 0. Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Clark Williams --- arch/riscv/kernel/cpufeature.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: linux-6.6.58-rt45/arch/riscv/kernel/cpufeature.c =================================================================== --- linux-6.6.58-rt45.orig/arch/riscv/kernel/cpufeature.c +++ linux-6.6.58-rt45/arch/riscv/kernel/cpufeature.c @@ -592,7 +592,7 @@ static int check_unaligned_access(void * /* We are already set since the last check */ if (per_cpu(misaligned_access_speed, cpu) != RISCV_HWPROBE_MISALIGNED_UNKNOWN) - return; + return 0; /* Make an unaligned destination buffer. */ dst = (void *)((unsigned long)page_address(page) | 0x1);