From: Jack Steiner <steiner@sgi.com>
Date: Wed, 16 Jul 2008 16:11:59 +0000 (-0500)
Subject: x86: fix kernel_physical_mapping_init() for large x86 systems
X-Git-Tag: v2.6.27-rc1~1038^2~3
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e22146e610bb7aed63282148740ab1d1b91e1d90;p=linux-2.6-omap-h63xx.git

x86: fix kernel_physical_mapping_init() for large x86 systems

Fix bug in kernel_physical_mapping_init() that causes kernel
page table to be built incorrectly for systems with greater
than 512GB of memory.

Signed-off-by: Jack Steiner <steiner@sgi.com>
Cc: linux-mm@kvack.org
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 27de2435e00..306049edd55 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -644,7 +644,7 @@ static unsigned long __init kernel_physical_mapping_init(unsigned long start,
 		unsigned long pud_phys;
 		pud_t *pud;
 
-		next = start + PGDIR_SIZE;
+		next = (start + PGDIR_SIZE) & PGDIR_MASK;
 		if (next > end)
 			next = end;