---

yaml --- r: 99967 b: refs/heads/master c: 8207c25 h: refs/heads/master i: 99965: 4f73e7a 99963: df33425 99959: 948b104 99951: cbf508e 99935: 83f400e 99903: 579f16e 99839: 68d3e05 v: v3
git-mirror · Jul 8, 2008 · 760aeb1 · 760aeb1
1 parent aa6f618
commit 760aeb1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9f9d489a3e78b49d897734eaaf9dea568dbea66e
+refs/heads/master: 8207c2570af6f819b61be9ef3fb298d0a8c0e18c
diff --git a/trunk/arch/x86/mm/init_32.c b/trunk/arch/x86/mm/init_32.c
@@ -733,6 +733,11 @@ static void __init find_early_table_space(unsigned long end)
 	pmds = (end + PMD_SIZE - 1) >> PMD_SHIFT;
 	tables += PAGE_ALIGN(pmds * sizeof(pmd_t));
 
+	if (!cpu_has_pse) {
+		int ptes = (end + PAGE_SIZE - 1) >> PAGE_SHIFT;
+		tables += PAGE_ALIGN(ptes * sizeof(pte_t));
+	}
+
 	/*
 	 * RED-PEN putting page tables only on node 0 could
 	 * cause a hotspot and fill up ZONE_DMA. The page tables