From 0222c38880d5cb4d8bb5342081a17420626ad098 Mon Sep 17 00:00:00 2001 From: Alex Williamson Date: Mon, 10 Dec 2012 10:33:26 -0700 Subject: [PATCH] --- yaml --- r: 356791 b: refs/heads/master c: 6104f472a5ea287fbdcf4644e74867dfd905a018 h: refs/heads/master i: 356789: 51fdc15580d8860b741d7a6efca78f07a5f566bc 356787: 5b16861bb50180ca959ebcf321e9e19d5af91e87 356783: 3df1df6bb1e9ccb92adc7e5a064f96bb2948656d v: v3 --- [refs] | 2 +- trunk/include/linux/kvm_host.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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; };