diff options
| author | Alexander Graf <agraf@suse.de> | 2013-02-14 19:12:59 -0500 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2013-02-14 19:12:59 -0500 |
| commit | 899f7b26bc4549cd5da8ac7688ed7e9d017f21b5 (patch) | |
| tree | b321cb79f7ba6802d24015b85a08b2567dad081f /include/linux | |
| parent | 011da8996263f799a469a761ee15c998d7ef1acb (diff) | |
| parent | cbd29cb6e38af6119df2cdac0c58acf0e85c177e (diff) | |
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 { | |||
| 273 | unsigned long userspace_addr; | 273 | unsigned long userspace_addr; |
| 274 | u32 flags; | 274 | u32 flags; |
| 275 | short id; | 275 | short id; |
| 276 | bool user_alloc; | ||
| 277 | }; | 276 | }; |
| 278 | 277 | ||
| 279 | static inline unsigned long kvm_dirty_bitmap_bytes(struct kvm_memory_slot *memslot) | 278 | static inline unsigned long kvm_dirty_bitmap_bytes(struct kvm_memory_slot *memslot) |