Skip to content

Commit 2c010c6

Browse files
arndbgregkh
authored andcommitted
arm64: fix clang warning about TRAMP_VALIAS
[ Upstream commit 7f34b43 ] 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: bd09128 ("arm64: Add percpu vectors for EL1") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: James Morse <james.morse@arm.com> Link: https://lore.kernel.org/r/20220316183833.1563139-1-arnd@kernel.org Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 277b7f6 commit 2c010c6

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

arch/arm64/include/asm/vectors.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,14 @@ enum arm64_bp_harden_el1_vectors {
5656
DECLARE_PER_CPU_READ_MOSTLY(const char *, this_cpu_vector);
5757

5858
#ifndef CONFIG_UNMAP_KERNEL_AT_EL0
59-
#define TRAMP_VALIAS 0
59+
#define TRAMP_VALIAS 0ul
6060
#endif
6161

6262
static inline const char *
6363
arm64_get_bp_hardening_vector(enum arm64_bp_harden_el1_vectors slot)
6464
{
6565
if (arm64_kernel_unmapped_at_el0())
66-
return (char *)TRAMP_VALIAS + SZ_2K * slot;
66+
return (char *)(TRAMP_VALIAS + SZ_2K * slot);
6767

6868
WARN_ON_ONCE(slot == EL1_VECTOR_KPTI);
6969

0 commit comments

Comments
 (0)