Skip to content

Commit 142ff9b

Browse files
author
Marc Zyngier
committed
KVM: arm64: Drop unused workaround_flags vcpu field
workaround_flags is a leftover from our earlier Spectre-v4 workaround implementation, and now serves no purpose. Get rid of the field and the corresponding asm-offset definition. Fixes: 29e8910 ("KVM: arm64: Simplify handling of ARCH_WORKAROUND_2") Signed-off-by: Marc Zyngier <[email protected]>
1 parent f0e6e6f commit 142ff9b

File tree

2 files changed

+0
-4
lines changed

2 files changed

+0
-4
lines changed

arch/arm64/include/asm/kvm_host.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -298,9 +298,6 @@ struct kvm_vcpu_arch {
298298
/* Exception Information */
299299
struct kvm_vcpu_fault_info fault;
300300

301-
/* State of various workarounds, see kvm_asm.h for bit assignment */
302-
u64 workaround_flags;
303-
304301
/* Miscellaneous vcpu state flags */
305302
u64 flags;
306303

arch/arm64/kernel/asm-offsets.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ int main(void)
111111
#ifdef CONFIG_KVM
112112
DEFINE(VCPU_CONTEXT, offsetof(struct kvm_vcpu, arch.ctxt));
113113
DEFINE(VCPU_FAULT_DISR, offsetof(struct kvm_vcpu, arch.fault.disr_el1));
114-
DEFINE(VCPU_WORKAROUND_FLAGS, offsetof(struct kvm_vcpu, arch.workaround_flags));
115114
DEFINE(VCPU_HCR_EL2, offsetof(struct kvm_vcpu, arch.hcr_el2));
116115
DEFINE(CPU_USER_PT_REGS, offsetof(struct kvm_cpu_context, regs));
117116
DEFINE(CPU_RGSR_EL1, offsetof(struct kvm_cpu_context, sys_regs[RGSR_EL1]));

0 commit comments

Comments
 (0)