---

yaml --- r: 356791 b: refs/heads/master c: 6104f47 h: refs/heads/master i: 356789: 51fdc15 356787: 5b16861 356783: 3df1df6 v: v3
git-mirror · Dec 14, 2012 · 0222c38 · 0222c38
1 parent 4fd0b49
commit 0222c38
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f82a8cfe9354f5cdea55ebeceba3fd19051d3ee8
+refs/heads/master: 6104f472a5ea287fbdcf4644e74867dfd905a018
diff --git a/trunk/include/linux/kvm_host.h b/trunk/include/linux/kvm_host.h
@@ -266,10 +266,10 @@ static inline int kvm_vcpu_exiting_guest_mode(struct kvm_vcpu *vcpu)
 struct kvm_memory_slot {
 	gfn_t base_gfn;
 	unsigned long npages;
-	unsigned long flags;
 	unsigned long *dirty_bitmap;
 	struct kvm_arch_memory_slot arch;
 	unsigned long userspace_addr;
+	u32 flags;
 	int id;
 	bool user_alloc;
 };