From 04ee53a55543ddc16398391ac95e97e5c9436ba3 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Fri, 22 Oct 2021 15:16:35 +0100 Subject: [PATCH] arm64/sve: Fix warnings when SVE is disabled In configurations where SVE is disabled we define but never reference the functions for retrieving the default vector length, causing warnings. Fix this by move the ifdef up, marking get_default_vl() inline since it is referenced from code guarded by an IS_ENABLED() check, and do the same for the other accessors for consistency. Reported-by: Catalin Marinas Signed-off-by: Mark Brown Link: https://lore.kernel.org/r/20211022141635.2360415-3-broonie@kernel.org Signed-off-by: Will Deacon --- arch/arm64/kernel/fpsimd.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm64/kernel/fpsimd.c b/arch/arm64/kernel/fpsimd.c index 3474122f9207..fa244c426f61 100644 --- a/arch/arm64/kernel/fpsimd.c +++ b/arch/arm64/kernel/fpsimd.c @@ -150,24 +150,24 @@ struct vl_config { static struct vl_config vl_config[ARM64_VEC_MAX]; -static int get_default_vl(enum vec_type type) +static inline int get_default_vl(enum vec_type type) { return READ_ONCE(vl_config[type].__default_vl); } -static int get_sve_default_vl(void) +#ifdef CONFIG_ARM64_SVE + +static inline int get_sve_default_vl(void) { return get_default_vl(ARM64_VEC_SVE); } -#ifdef CONFIG_ARM64_SVE - -static void set_default_vl(enum vec_type type, int val) +static inline void set_default_vl(enum vec_type type, int val) { WRITE_ONCE(vl_config[type].__default_vl, val); } -static void set_sve_default_vl(int val) +static inline void set_sve_default_vl(int val) { set_default_vl(ARM64_VEC_SVE, val); }