summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Steiner <steiner@sgi.com>2008-07-16 11:11:59 -0500
committerIngo Molnar <mingo@elte.hu>2008-07-16 18:27:36 +0200
commite22146e610bb7aed63282148740ab1d1b91e1d90 (patch)
tree85cb5c7578efbab1d0e37382bf213da5ebeded37
parent45158894d4d6704afbb4cefe55e5f6ca279fe12a (diff)
downloadop-kernel-dev-e22146e610bb7aed63282148740ab1d1b91e1d90.zip
op-kernel-dev-e22146e610bb7aed63282148740ab1d1b91e1d90.tar.gz
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>
-rw-r--r--arch/x86/mm/init_64.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 27de243..306049e 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;
OpenPOWER on IntegriCloud