Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58ee8e2c authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

arm64: fix clang warning about TRAMP_VALIAS 



[ Upstream commit 7f34b43e07cb512b28543fdcb9f35d1fbfda9ebc ]

The newly introduced TRAMP_VALIAS definition causes a build warning
with clang-14:

arch/arm64/include/asm/vectors.h:66:31: error: arithmetic on a null pointer treated as a cast from integer to pointer is a GNU extension [-Werror,-Wnull-pointer-arithmetic]
                return (char *)TRAMP_VALIAS + SZ_2K * slot;

Change the addition to something clang does not complain about.

Fixes: bd09128d16fa ("arm64: Add percpu vectors for EL1")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarJames Morse <james.morse@arm.com>
Link: https://lore.kernel.org/r/20220316183833.1563139-1-arnd@kernel.org


Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent d7b92963

arch/arm64/include/asm/vectors.h

+2 −2
Original line number Diff line number Diff line
@@ -56,14 +56,14 @@ enum arm64_bp_harden_el1_vectors { 
DECLARE_PER_CPU_READ_MOSTLY(const char *, this_cpu_vector);



#ifndef CONFIG_UNMAP_KERNEL_AT_EL0

#define TRAMP_VALIAS	0

#define TRAMP_VALIAS	0ul

#endif



static inline const char *

arm64_get_bp_hardening_vector(enum arm64_bp_harden_el1_vectors slot)

{

	if (arm64_kernel_unmapped_at_el0())

		return (char *)TRAMP_VALIAS + SZ_2K * slot;

		return (char *)(TRAMP_VALIAS + SZ_2K * slot);



	WARN_ON_ONCE(slot == EL1_VECTOR_KPTI);