Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[sfrench/cifs-2.6.git] / arch / x86 / kernel / kvm.c

diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
index 4d053cb2c48a48be477d05a0797c451499b769ec..1cceac5984daa902f311a4001ba1a028ab6f91b3 100644 (file)
--- a/arch/x86/kernel/kvm.c
+++ b/arch/x86/kernel/kvm.c
@@ -349,7 +349,7 @@ static notrace void kvm_guest_apic_eoi_write(u32 reg, u32 val)
 static void kvm_guest_cpu_init(void)
 {
        if (kvm_para_has_feature(KVM_FEATURE_ASYNC_PF_INT) && kvmapf) {
-               u64 pa = slow_virt_to_phys(this_cpu_ptr(&apf_reason));
+               u64 pa;
 
                WARN_ON_ONCE(!static_branch_likely(&kvm_async_pf_enabled));