x86, mm: Undo incorrect revert in arch/x86/mm/init.c

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>

diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index bc287d62bf1eeb50c4c0ca6d77ce00dc344e3973..d7aea41563b372437eb227a499259be23d755564 100644 (file)
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -65,10 +65,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;