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 /include/linux | |
| parent | KVM: PPC: BookE: Handle alignment interrupts (diff) | |
| parent | KVM: nVMX: Remove redundant get_vmcs12 from nested_vmx_exit_handled_msr (diff) | |
| download | wireguard-linux-899f7b26bc4549cd5da8ac7688ed7e9d017f21b5.tar.xz wireguard-linux-899f7b26bc4549cd5da8ac7688ed7e9d017f21b5.zip | |
Merge commit 'origin/next' into kvm-ppc-next
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/kvm_host.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 0350e0d5e031..722cae78bbc4 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -273,7 +273,6 @@ struct kvm_memory_slot { unsigned long userspace_addr; u32 flags; short id; - bool user_alloc; }; static inline unsigned long kvm_dirty_bitmap_bytes(struct kvm_memory_slot *memslot) |