From f1b95de368f57b5ae1089d1eaf17133192d244df Mon Sep 17 00:00:00 2001
From: Takuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp>
Date: Wed, 21 Mar 2012 23:49:39 +0900
Subject: [PATCH] --- yaml --- r: 307857 b: refs/heads/master c:
 220f773a0013bf6fe2eefd9718ac7471f368fd8e h: refs/heads/master i:   307855:
 12fe96315397d4877df990c69449b593b40c8dde v: v3

---
 [refs]                   | 2 +-
 trunk/arch/x86/kvm/mmu.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ab59cfafc56d..2dfac690a5d4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c36fc04ef558c95cff46a8c89d2f804f217335f5
+refs/heads/master: 220f773a0013bf6fe2eefd9718ac7471f368fd8e
diff --git a/trunk/arch/x86/kvm/mmu.c b/trunk/arch/x86/kvm/mmu.c
index dc5f2459db6c..3213348e3a93 100644
--- a/trunk/arch/x86/kvm/mmu.c
+++ b/trunk/arch/x86/kvm/mmu.c
@@ -135,8 +135,6 @@ module_param(dbg, bool, 0644);
 #define PT64_PERM_MASK (PT_PRESENT_MASK | PT_WRITABLE_MASK | PT_USER_MASK \
 			| PT64_NX_MASK)
 
-#define PTE_LIST_EXT 4
-
 #define ACC_EXEC_MASK    1
 #define ACC_WRITE_MASK   PT_WRITABLE_MASK
 #define ACC_USER_MASK    PT_USER_MASK
@@ -151,6 +149,9 @@ module_param(dbg, bool, 0644);
 
 #define SHADOW_PT_INDEX(addr, level) PT64_INDEX(addr, level)
 
+/* make pte_list_desc fit well in cache line */
+#define PTE_LIST_EXT 3
+
 struct pte_list_desc {
 	u64 *sptes[PTE_LIST_EXT];
 	struct pte_list_desc *more;