Merge branches 'fixes', 'misc' and 'spectre' into for-linus

[sfrench/cifs-2.6.git] / arch / arm / include / asm / kvm_host.h

diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h
index 11f91744ffb0fdedaa0488409f0aa7f9d4f5f958..8467e05360d7a3395d1a50b9b97c12f021e4ffc9 100644 (file)
--- a/arch/arm/include/asm/kvm_host.h
+++ b/arch/arm/include/asm/kvm_host.h
@@ -156,9 +156,6 @@ struct kvm_vcpu_arch {
        /* HYP trapping configuration */
        u32 hcr;
 
-       /* Interrupt related fields */
-       u32 irq_lines;          /* IRQ and FIQ levels */
-
        /* Exception Information */
        struct kvm_vcpu_fault_info fault;
 
@@ -325,4 +322,7 @@ static inline bool kvm_arm_harden_branch_predictor(void)
        }
 }
 
+static inline void kvm_vcpu_load_sysregs(struct kvm_vcpu *vcpu) {}
+static inline void kvm_vcpu_put_sysregs(struct kvm_vcpu *vcpu) {}
+
 #endif /* __ARM_KVM_HOST_H__ */