arm64: KVM: Move VCPU_WORKAROUND_2_FLAG macros to the top of the file (38500be1) · Commits · 戴 / test

This is to avoid potential merging conflicts between commit ("arm64: KVM: Add ARCH_WORKAROUND_2 support for guests") and the KVM tree. Signed-off-by:

arch/arm64/include/asm/kvm_asm.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -20,6 +20,9 @@

		#include <asm/virt.h>

		#define VCPU_WORKAROUND_2_FLAG_SHIFT 0
		#define VCPU_WORKAROUND_2_FLAG (_AC(1, UL) << VCPU_WORKAROUND_2_FLAG_SHIFT)

		#define ARM_EXIT_WITH_SERROR_BIT 31
		#define ARM_EXCEPTION_CODE(x) ((x) & ~(1U << ARM_EXIT_WITH_SERROR_BIT))
		#define ARM_SERROR_PENDING(x) !!((x) & (1U << ARM_EXIT_WITH_SERROR_BIT))
		@@ -33,9 +36,6 @@
		#define KVM_ARM64_DEBUG_DIRTY_SHIFT 0
		#define KVM_ARM64_DEBUG_DIRTY (1 << KVM_ARM64_DEBUG_DIRTY_SHIFT)

		#define VCPU_WORKAROUND_2_FLAG_SHIFT 0
		#define VCPU_WORKAROUND_2_FLAG (_AC(1, UL) << VCPU_WORKAROUND_2_FLAG_SHIFT)

		/* Translate a kernel address of @sym into its equivalent linear mapping */
		#define kvm_ksym_ref(sym) \
		({ \