s390/setup: correct 4-level kernel page table detection (242a112a) · Commits · 戴 / test

Fix calculation to decide if a 4-level kernel page table is required. Git commit "s390/vmalloc: have separate modules area" added the separate module area which reduces the size of the vmalloc area but fails to take it into account for the 3 vs 4 level page table decision. Signed-off-by:

Martin Schwidefsky <schwidefsky@de.ibm.com>

arch/s390/kernel/setup.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -452,8 +452,8 @@ static void __init setup_memory_end(void)
	#ifdef CONFIG_64BIT		#ifdef CONFIG_64BIT
	vmalloc_size = VMALLOC_END ?: (128UL << 30) - MODULES_LEN;		vmalloc_size = VMALLOC_END ?: (128UL << 30) - MODULES_LEN;
	tmp = (memory_end ?: max_physmem_end) / PAGE_SIZE;		tmp = (memory_end ?: max_physmem_end) / PAGE_SIZE;
	tmp = tmp * (sizeof(struct page) + PAGE_SIZE) + vmalloc_size;		tmp = tmp * (sizeof(struct page) + PAGE_SIZE);
	if (tmp <= (1UL << 42))		if (tmp + vmalloc_size + MODULES_LEN <= (1UL << 42))
	vmax = 1UL << 42; /* 3-level kernel page table */		vmax = 1UL << 42; /* 3-level kernel page table */
	else		else
	vmax = 1UL << 53; /* 4-level kernel page table */		vmax = 1UL << 53; /* 4-level kernel page table */

Admin message