Commit f82f64dd authored Oct 25, 2012 by Yinghai Lu Committed by H. Peter Anvin Oct 25, 2012

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

    7b16bbf9 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>

parent 844ab6f9

arch/x86/mm/init.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -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;