Merge branch 'linus' into smp/hotplug

Apply upstream changes to avoid conflicts with pending patches.

2 files changed, 6 insertions, 2 deletions

diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
index d94bb9093ead..75f130ef6504 100644
--- a/arch/arm/kvm/arm.c
+++ b/arch/arm/kvm/arm.c
@@ -1009,9 +1009,13 @@ long kvm_arch_vm_ioctl(struct file *filp,
 
         switch (ioctl) {
         case KVM_CREATE_IRQCHIP: {
+                int ret;
                 if (!vgic_present)
                         return -ENXIO;
-                return kvm_vgic_create(kvm, KVM_DEV_TYPE_ARM_VGIC_V2);
+                mutex_lock(&kvm->lock);
+                ret = kvm_vgic_create(kvm, KVM_DEV_TYPE_ARM_VGIC_V2);
+                mutex_unlock(&kvm->lock);
+                return ret;
         }
         case KVM_ARM_SET_DEVICE_ADDR: {
                 struct kvm_arm_device_addr dev_addr;
diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c
index bda27b6b1aa2..29d0b23af2a9 100644
--- a/arch/arm/kvm/mmu.c
+++ b/arch/arm/kvm/mmu.c
@@ -1309,7 +1309,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,
         smp_rmb();
 
         pfn = gfn_to_pfn_prot(kvm, gfn, write_fault, &writable);
-        if (is_error_pfn(pfn))
+        if (is_error_noslot_pfn(pfn))
                 return -EFAULT;
 
         if (kvm_is_device_pfn(pfn)) {