diff --git a/[refs] b/[refs] index d0b83da1e600..5cfa33ed3c1a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 965b58a550b6f84815cb555e6abb953e863f1610 +refs/heads/master: d3b2c33860d4acdfe3ac29b40b03e655eb8d1e2c diff --git a/trunk/drivers/kvm/vmx.c b/trunk/drivers/kvm/vmx.c index fbab07af6574..2d204fd45972 100644 --- a/trunk/drivers/kvm/vmx.c +++ b/trunk/drivers/kvm/vmx.c @@ -116,7 +116,7 @@ static void vmcs_clear(struct vmcs *vmcs) static void __vcpu_clear(void *arg) { struct kvm_vcpu *vcpu = arg; - int cpu = smp_processor_id(); + int cpu = raw_smp_processor_id(); if (vcpu->cpu == cpu) vmcs_clear(vcpu->vmcs); @@ -541,7 +541,7 @@ static struct vmcs *alloc_vmcs_cpu(int cpu) static struct vmcs *alloc_vmcs(void) { - return alloc_vmcs_cpu(smp_processor_id()); + return alloc_vmcs_cpu(raw_smp_processor_id()); } static void free_vmcs(struct vmcs *vmcs)