From f55f5bb5602be19d573205e3d08ccb278dfb76b1 Mon Sep 17 00:00:00 2001
From: Andrea Arcangeli <aarcange@redhat.com>
Date: Thu, 11 Apr 2013 15:36:09 +0200
Subject: [PATCH] --- yaml --- r: 362531 b: refs/heads/master c:
 18699739b60cb60230153ff5475b2ba92be185f9 h: refs/heads/master i:   362529:
 90c5ff67f790a9c14992ea954b9a59ab800bf051   362527:
 9fa27a05576fc43fe4dccd02b3fcd69d2c266278 v: v3

---
 [refs]                            | 2 +-
 trunk/arch/x86/mm/pageattr-test.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6548788ecd93..4b7472ac208d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f76cfa3c2496c462b5bc01bd0c9340c2715b73ca
+refs/heads/master: 18699739b60cb60230153ff5475b2ba92be185f9
diff --git a/trunk/arch/x86/mm/pageattr-test.c b/trunk/arch/x86/mm/pageattr-test.c
index b0086567271c..0e38951e65eb 100644
--- a/trunk/arch/x86/mm/pageattr-test.c
+++ b/trunk/arch/x86/mm/pageattr-test.c
@@ -68,7 +68,7 @@ static int print_split(struct split_state *s)
 			s->gpg++;
 			i += GPS/PAGE_SIZE;
 		} else if (level == PG_LEVEL_2M) {
-			if (!(pte_val(*pte) & _PAGE_PSE)) {
+			if ((pte_val(*pte) & _PAGE_PRESENT) && !(pte_val(*pte) & _PAGE_PSE)) {
 				printk(KERN_ERR
 					"%lx level %d but not PSE %Lx\n",
 					addr, level, (u64)pte_val(*pte));