aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2012-10-25 15:45:26 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-31 09:51:37 -0700
commit0ac1713daef94fa5a28947ce7149d45d4202da7d (patch)
tree64818cb338df576f6cc591a92626dd51fc298165
parent0582e57500558d660c9fd83c77b7a6a0dbda989f (diff)
downloadkernel_samsung_crespo-0ac1713daef94fa5a28947ce7149d45d4202da7d.zip
kernel_samsung_crespo-0ac1713daef94fa5a28947ce7149d45d4202da7d.tar.gz
kernel_samsung_crespo-0ac1713daef94fa5a28947ce7149d45d4202da7d.tar.bz2
x86, mm: Undo incorrect revert in arch/x86/mm/init.c
commit f82f64dd9f485e13f29f369772d4a0e868e5633a upstream. Commit 844ab6f9 x86, mm: Find_early_table_space based on ranges that are actually being mapped added back some lines back wrongly that has been removed in commit 7b16bbf97 Revert "x86/mm: Fix the size calculation of mapping tables" remove them again. Signed-off-by: Yinghai Lu <yinghai@kernel.org> Link: http://lkml.kernel.org/r/CAE9FiQW_vuaYQbmagVnxT2DGsYc=9tNeAbdBq53sYkitPOwxSQ@mail.gmail.com Acked-by: Jacob Shin <jacob.shin@amd.com> Signed-off-by: H. Peter Anvin <hpa@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/x86/mm/init.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index 1dccf01..c22c423 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -64,10 +64,6 @@ static void __init find_early_table_space(struct map_range *mr, int nr_range)
#ifdef CONFIG_X86_32
extra += PMD_SIZE;
#endif
- /* The first 2/4M doesn't use large pages. */
- if (mr[i].start < PMD_SIZE)
- extra += range;
-
ptes += (extra + PAGE_SIZE - 1) >> PAGE_SHIFT;
} else {
ptes += (range + PAGE_SIZE - 1) >> PAGE_SHIFT;