From f30e6cc891f849b69ad0a1f99b8ec20b16fb3af4 Mon Sep 17 00:00:00 2001
From: Davidlohr Bueso <dave@gnu.org>
Date: Wed, 18 Apr 2012 12:24:29 +0200
Subject: [PATCH] --- yaml --- r: 307867 b: refs/heads/master c:
 f71fa31f9f7ac33cba12b8897983f950ad2c7a5b h: refs/heads/master i:   307865:
 0a8ffd6a03499d95225cf0bc0bbe353a46cd5017   307863:
 3fe1a9a23f34b27f7f47011df813d050e4a72365 v: v3

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

diff --git a/[refs] b/[refs]
index 1156feb24e40..1f5f0a74e28d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a0c9a822bf37e6282eb6006b407ec5aec22e08fb
+refs/heads/master: f71fa31f9f7ac33cba12b8897983f950ad2c7a5b
diff --git a/trunk/arch/x86/kvm/mmu.c b/trunk/arch/x86/kvm/mmu.c
index 29ad6f9c58a5..07424cf60434 100644
--- a/trunk/arch/x86/kvm/mmu.c
+++ b/trunk/arch/x86/kvm/mmu.c
@@ -3618,7 +3618,7 @@ static bool detect_write_flooding(struct kvm_mmu_page *sp)
 	 * Skip write-flooding detected for the sp whose level is 1, because
 	 * it can become unsync, then the guest page is not write-protected.
 	 */
-	if (sp->role.level == 1)
+	if (sp->role.level == PT_PAGE_TABLE_LEVEL)
 		return false;
 
 	return ++sp->write_flooding_count >= 3;
diff --git a/trunk/arch/x86/kvm/paging_tmpl.h b/trunk/arch/x86/kvm/paging_tmpl.h
index df5a70311be8..34f970937ef1 100644
--- a/trunk/arch/x86/kvm/paging_tmpl.h
+++ b/trunk/arch/x86/kvm/paging_tmpl.h
@@ -658,7 +658,7 @@ static gpa_t FNAME(get_level1_sp_gpa)(struct kvm_mmu_page *sp)
 {
 	int offset = 0;
 
-	WARN_ON(sp->role.level != 1);
+	WARN_ON(sp->role.level != PT_PAGE_TABLE_LEVEL);
 
 	if (PTTYPE == 32)
 		offset = sp->role.quadrant << PT64_LEVEL_BITS;