diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-06-11 08:51:35 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-06-11 08:51:35 (GMT) |
| commit | c3e228d59bd2054fd57f7f146ef0f6fb0e1996b7 (patch) | |
| tree | 1817910408fa7b5027e463725a6eb54933c71928 /arch/x86/mm/init.c | |
| parent | 7eb9ba5ed312ec6ed9d22259c5da1acb7cf4bd29 (diff) | |
| parent | cfaf025112d3856637ff34a767ef785ef5cf2ca9 (diff) | |
| download | linux-fsl-qoriq-c3e228d59bd2054fd57f7f146ef0f6fb0e1996b7.tar.xz | |
Merge tag 'v3.5-rc2' into perf/core
Merge in Linux 3.5-rc2 - to pick up fixes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/mm/init.c')
| -rw-r--r-- | arch/x86/mm/init.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c index 97141c2..bc4e9d8 100644 --- a/arch/x86/mm/init.c +++ b/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 |