diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2014-02-14 11:10:07 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-02-14 11:10:07 +0100 |
| commit | f18eb31f9df52c28ec86d18d72f66ef689878daa (patch) | |
| tree | 1e472c25551774897e54b143bab3f463f31cda43 /virt | |
| parent | 1179ba539541347d5427cde8bcfdaa5ead14f3aa (diff) | |
| parent | 2a2f3e269c75edf916de5967079069aeb6a601cb (diff) | |
| download | blackbird-op-linux-f18eb31f9df52c28ec86d18d72f66ef689878daa.tar.gz blackbird-op-linux-f18eb31f9df52c28ec86d18d72f66ef689878daa.zip | |
Merge branch 'kvm-master' into kvm-queue
Diffstat (limited to 'virt')
| -rw-r--r-- | virt/kvm/arm/vgic.c | 1 | ||||
| -rw-r--r-- | virt/kvm/coalesced_mmio.c | 8 |
2 files changed, 3 insertions, 6 deletions
diff --git a/virt/kvm/arm/vgic.c b/virt/kvm/arm/vgic.c index be456ce264d0..8ca405cd7c1a 100644 --- a/virt/kvm/arm/vgic.c +++ b/virt/kvm/arm/vgic.c @@ -24,6 +24,7 @@ #include <linux/of.h> #include <linux/of_address.h> #include <linux/of_irq.h> +#include <linux/uaccess.h> #include <linux/irqchip/arm-gic.h> diff --git a/virt/kvm/coalesced_mmio.c b/virt/kvm/coalesced_mmio.c index 88b2fe3ddf42..00d86427af0f 100644 --- a/virt/kvm/coalesced_mmio.c +++ b/virt/kvm/coalesced_mmio.c @@ -154,17 +154,13 @@ int kvm_vm_ioctl_register_coalesced_mmio(struct kvm *kvm, list_add_tail(&dev->list, &kvm->coalesced_zones); mutex_unlock(&kvm->slots_lock); - return ret; + return 0; out_free_dev: mutex_unlock(&kvm->slots_lock); - kfree(dev); - if (dev == NULL) - return -ENXIO; - - return 0; + return ret; } int kvm_vm_ioctl_unregister_coalesced_mmio(struct kvm *kvm, |
