From 760aeb1cecfd88d12557e52a5ec53f2a79a4323b Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Tue, 24 Jun 2008 17:32:48 -0400
Subject: [PATCH] --- yaml --- r: 99967 b: refs/heads/master c:
 8207c2570af6f819b61be9ef3fb298d0a8c0e18c h: refs/heads/master i:   99965:
 4f73e7aeaad6b9286b79fe8ebb4c2f2ef226bec3   99963:
 df33425383a2fa5ea2ef9b4fca9f213380cd013b   99959:
 948b1043c3111498c45b57e1e8a6d80ecb6a56f1   99951:
 cbf508e92ce5330d4b3be8b275a8dc2d06c2cc46   99935:
 83f400e559ffc94229fc10235c5432f04a529856   99903:
 579f16ee4fb2803a5f9516858b71c28ec07635c9   99839:
 68d3e0580f0322dc4f736346c60dd4bac328d24a v: v3

---
 [refs]                      | 2 +-
 trunk/arch/x86/mm/init_32.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2c3353a5ce8a..4158c9bfec57 100644
--- 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
index c059c460e32d..156000de6e62 100644
--- 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