diff options
| author | Alexander Graf <agraf@suse.de> | 2013-02-15 01:12:59 +0100 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2013-02-15 01:12:59 +0100 |
| commit | 899f7b26bc4549cd5da8ac7688ed7e9d017f21b5 (patch) | |
| tree | b321cb79f7ba6802d24015b85a08b2567dad081f /virt/kvm/kvm_main.c | |
| parent | 011da8996263f799a469a761ee15c998d7ef1acb (diff) | |
| parent | cbd29cb6e38af6119df2cdac0c58acf0e85c177e (diff) | |
Merge commit 'origin/next' into kvm-ppc-next
Diffstat (limited to 'virt/kvm/kvm_main.c')
| -rw-r--r-- | virt/kvm/kvm_main.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 2e93630b4add..adc68feb5c5a 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -839,7 +839,6 @@ int __kvm_set_memory_region(struct kvm *kvm, r = -ENOMEM; if (change == KVM_MR_CREATE) { - new.user_alloc = user_alloc; new.userspace_addr = mem->userspace_addr; if (kvm_arch_create_memslot(&new, npages)) |