---

yaml --- r: 99972 b: refs/heads/master c: 22b4514 h: refs/heads/master v: v3
git-mirror · Jul 8, 2008 · 0e61111 · 0e61111
1 parent c6ee7a8
commit 0e61111
Show file tree

Hide file tree

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