Commit 34e047aa authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux 

Pull arm64 fixes from Catalin Marinas:
 "Fix two compiler warnings introduced by recent commits: pointer
  arithmetic and double initialisation of struct field"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: errata: avoid duplicate field initializer
  arm64: fix clang warning about TRAMP_VALIAS
parents 6e406988 316e46f6

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);

arch/arm64/kernel/cpu_errata.c

+0 −1
Original line number Diff line number Diff line
@@ -611,7 +611,6 @@ const struct arm64_cpu_capabilities arm64_errata[] = { 
	{

		.desc = "ARM erratum 2077057",

		.capability = ARM64_WORKAROUND_2077057,

		.type = ARM64_CPUCAP_LOCAL_CPU_ERRATUM,

		ERRATA_MIDR_REV_RANGE(MIDR_CORTEX_A510, 0, 0, 2),

	},

#endif