---

yaml --- r: 80477 b: refs/heads/master c: bbb09f5 h: refs/heads/master i: 80475: ea55917 v: v3
git-mirror · Jan 30, 2008 · ce17dd9 · ce17dd9
1 parent 98f608d
commit ce17dd9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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);