From 0e6111170ff6fef1941e7bd85f679f268c70441f Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Thu, 26 Jun 2008 12:02:49 -0700
Subject: [PATCH] --- yaml --- r: 99972 b: refs/heads/master c:
 22b45144f67dbaf0705992dc1462de2813fb83a1 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index bbea36134893..3921cf5c5218 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 457da70ec09ca78e8fda5d5ab3659248f844a376
+refs/heads/master: 22b45144f67dbaf0705992dc1462de2813fb83a1
diff --git a/trunk/arch/x86/mm/init_64.c b/trunk/arch/x86/mm/init_64.c
index 5c3305e05078..b10b7f17ea58 100644
--- a/trunk/arch/x86/mm/init_64.c
+++ b/trunk/arch/x86/mm/init_64.c
@@ -320,7 +320,8 @@ phys_pmd_init(pmd_t *pmd_page, unsigned long address, unsigned long end)
 		}
 
 		if (pmd_val(*pmd)) {
-			phys_pte_update(pmd, address, end);
+			if (!pmd_large(*pmd))
+				phys_pte_update(pmd, address, end);
 			continue;
 		}