From ce17dd99cdcc53f1c5a61b00c9a21ed9df6ecb64 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 30 Jan 2008 13:33:59 +0100
Subject: [PATCH] --- yaml --- r: 80477 b: refs/heads/master c:
 bbb09f5cfcde7e4cf1466111d671ac4a62931148 h: refs/heads/master i:   80475:
 ea559179d063964a82fdf508a0417b1389ea0ac1 v: v3

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

diff --git a/[refs] b/[refs]
index 25bc9bbca0a8..c90ccad86483 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 55ce29ba16f82a31424a98988cf37c3babe1b7c8
+refs/heads/master: bbb09f5cfcde7e4cf1466111d671ac4a62931148
diff --git a/trunk/arch/x86/mm/pageattr-test.c b/trunk/arch/x86/mm/pageattr-test.c
index 0dce0e248a42..6cc106b388a5 100644
--- a/trunk/arch/x86/mm/pageattr-test.c
+++ b/trunk/arch/x86/mm/pageattr-test.c
@@ -20,10 +20,10 @@ enum {
 	LOWEST_LEVEL		= 4,
 	LPS			= (1 << PMD_SHIFT),
 #elif defined(CONFIG_X86_PAE)
-	LOWEST_LEVEL		= 3,
+	LOWEST_LEVEL		= 4,
 	LPS			= (1 << PMD_SHIFT),
 #else
-	LOWEST_LEVEL		= 3, /* lookup_address lies here */
+	LOWEST_LEVEL		= 4, /* lookup_address lies here */
 	LPS			= (1 << 22),
 #endif
 	GPS			= (1<<30)
diff --git a/trunk/arch/x86/mm/pageattr_32.c b/trunk/arch/x86/mm/pageattr_32.c
index dd49b16b3a0e..1c7bd81a4194 100644
--- a/trunk/arch/x86/mm/pageattr_32.c
+++ b/trunk/arch/x86/mm/pageattr_32.c
@@ -29,10 +29,10 @@ pte_t *lookup_address(unsigned long address, int *level)
 	pmd = pmd_offset(pud, address);
 	if (pmd_none(*pmd))
 		return NULL;
-	*level = 2;
+	*level = 3;
 	if (pmd_large(*pmd))
 		return (pte_t *)pmd;
-	*level = 3;
+	*level = 4;
 
 	return pte_offset_kernel(pmd, address);
 }
@@ -136,7 +136,7 @@ static int __change_page_attr(struct page *page, pgprot_t prot)
 		address < (unsigned long)&_etext &&
 	       (pgprot_val(prot) & _PAGE_NX));
 
-	if (level == 3) {
+	if (level == 4) {
 		set_pte_atomic(kpte, mk_pte(page, canon_pgprot(prot)));
 	} else {
 		err = split_large_page(kpte, address);