diff --git a/[refs] b/[refs]
index 9c0f2739b2dc..4104dd061361 100644
--- 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
index d897f035749f..fec607537fa3 100644
--- 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;
 };