From 89467f35becea5940e121c4461277a3234da7d60 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@qumranet.com>
Date: Thu, 11 Oct 2007 15:08:41 +0200
Subject: [PATCH] --- yaml --- r: 80654 b: refs/heads/master c:
 c22e3514fceb2f514093ce1d19a2f660ac7347ae h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/kvm/paging_tmpl.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 035b31cab13b..a72ead490861 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3c5e7ec9efe0ebd47fa812cc86f01c51905edf6
+refs/heads/master: c22e3514fceb2f514093ce1d19a2f660ac7347ae
diff --git a/trunk/drivers/kvm/paging_tmpl.h b/trunk/drivers/kvm/paging_tmpl.h
index da36e48fd026..e07cb2e006c2 100644
--- a/trunk/drivers/kvm/paging_tmpl.h
+++ b/trunk/drivers/kvm/paging_tmpl.h
@@ -382,9 +382,9 @@ static u64 *FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr,
 			metaphysical = 1;
 			hugepage_access = walker->pte;
 			hugepage_access &= PT_USER_MASK | PT_WRITABLE_MASK;
+			hugepage_access >>= PT_WRITABLE_SHIFT;
 			if (walker->pte & PT64_NX_MASK)
 				hugepage_access |= (1 << 2);
-			hugepage_access >>= PT_WRITABLE_SHIFT;
 			table_gfn = (walker->pte & PT_BASE_ADDR_MASK)
 				>> PAGE_SHIFT;
 		} else {