diff options
| author | David S. Miller <davem@davemloft.net> | 2014-02-19 10:24:22 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-02-19 10:24:22 +0400 |
| commit | 1e8d6421cff2c24fe0b345711e7a21af02e8bcf5 (patch) | |
| tree | 773b30106efb9b48055bc93958e5a94ac53768ce /virt | |
| parent | f7b12606b5de323a2bb5ca1696558efde8f25441 (diff) | |
| parent | 960dfc4eb23a28495276b02604d7458e0e1a1ed8 (diff) | |
| download | linux-1e8d6421cff2c24fe0b345711e7a21af02e8bcf5.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/bonding/bond_3ad.h
drivers/net/bonding/bond_main.c
Two minor conflicts in bonding, both of which were overlapping
changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
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, |