Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8207c257 authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by Ingo Molnar
Browse files

x86: fix pte allocation in "x86: introduce init_memory_mapping for 32bit" 



The patch "x86: introduce init_memory_mapping for 32bit" does not allocate
enough space for PTEs if the CPU does not implement PSE.

Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Acked-by: default avatarYinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 9f9d489a

arch/x86/mm/init_32.c

+5 −0
Original line number Diff line number Diff line
@@ -733,6 +733,11 @@ static void __init find_early_table_space(unsigned long end) 
	pmds = (end + PMD_SIZE - 1) >> PMD_SHIFT;

	tables += PAGE_ALIGN(pmds * sizeof(pmd_t));



	if (!cpu_has_pse) {

		int ptes = (end + PAGE_SIZE - 1) >> PAGE_SHIFT;

		tables += PAGE_ALIGN(ptes * sizeof(pte_t));

	}



	/*

	 * RED-PEN putting page tables only on node 0 could

	 * cause a hotspot and fill up ZONE_DMA. The page tables