From cc07818e5e475c4ac0ee88130a2d4b329a53651e Mon Sep 17 00:00:00 2001 From: Andrew Cooper Date: Fri, 29 May 2020 22:23:59 +0100 Subject: [PATCH] arm: Fix build following c/s 8e2aa76dc MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The ARM side of the cpu_nr_siblings() was missing a return type. OSSTest reports: /home/osstest/build.150502.build-arm64-xsm/xen/xen/include/asm/cpufeature.h:67:15: error: return type defaults to 'int' [-Werror=implicit-int] static inline cpu_nr_siblings(unsigned int) ^~~~~~~~~~~~~~~ My local build test then reported: /local/xen.git/xen/include/asm/cpufeature.h: In function ‘cpu_nr_siblings’: /local/xen.git/xen/include/asm/cpufeature.h:67:1: error: parameter name omitted static inline int cpu_nr_siblings(unsigned int) ^ Fix it up to match its x86 counterpart. Signed-off-by: Andrew Cooper --- xen/include/asm-arm/cpufeature.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/include/asm-arm/cpufeature.h b/xen/include/asm-arm/cpufeature.h index 8fdf9685d7..674beb0353 100644 --- a/xen/include/asm-arm/cpufeature.h +++ b/xen/include/asm-arm/cpufeature.h @@ -64,7 +64,7 @@ static inline bool cpus_have_cap(unsigned int num) return test_bit(num, cpu_hwcaps); } -static inline cpu_nr_siblings(unsigned int) +static inline int cpu_nr_siblings(unsigned int cpu) { return 1; } -- 2.30.2