From f434e91f2dcc0e5c6726521fc0a124e88f38d2a7 Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yinghai@kernel.org>
Date: Wed, 6 Jun 2012 10:55:40 -0700
Subject: [PATCH] --- yaml --- r: 310618 b: refs/heads/master c:
 bd2753b2dda7bb43c7468826de75f49c6a7e8965 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 75b7857fce61..518b3efe7aba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 743628e868c5992354fc80b4d1e9a6143da1c0e6
+refs/heads/master: bd2753b2dda7bb43c7468826de75f49c6a7e8965
diff --git a/trunk/arch/x86/mm/init.c b/trunk/arch/x86/mm/init.c
index 97141c26a13a..bc4e9d84157f 100644
--- a/trunk/arch/x86/mm/init.c
+++ b/trunk/arch/x86/mm/init.c
@@ -62,7 +62,8 @@ static void __init find_early_table_space(struct map_range *mr, unsigned long en
 		extra += PMD_SIZE;
 #endif
 		/* The first 2/4M doesn't use large pages. */
-		extra += mr->end - mr->start;
+		if (mr->start < PMD_SIZE)
+			extra += mr->end - mr->start;
 
 		ptes = (extra + PAGE_SIZE - 1) >> PAGE_SHIFT;
 	} else