Commit 343dbdb7 authored by Gerald Schaefer's avatar Gerald Schaefer Committed by Heiko Carstens
Browse files

s390/mm: add support to allocate gigantic hugepages using CMA 



Commit cf11e85f ("mm: hugetlb: optionally allocate gigantic hugepages
using cma") added support for allocating gigantic hugepages using CMA,
by specifying the hugetlb_cma= kernel parameter, which will disable any
boot-time allocation of gigantic hugepages.

This patch enables that option also for s390.

Signed-off-by: default avatarGerald Schaefer <gerald.schaefer@linux.ibm.com>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parent ff98cc98

arch/s390/kernel/setup.c

+3 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
#include <linux/memory.h>

#include <linux/compat.h>

#include <linux/start_kernel.h>

#include <linux/hugetlb.h>



#include <asm/boot_data.h>

#include <asm/ipl.h>
@@ -1146,6 +1147,8 @@ void __init setup_arch(char **cmdline_p) 
	setup_memory();

	dma_contiguous_reserve(ident_map_size);

	vmcp_cma_reserve();

	if (MACHINE_HAS_EDAT2)

		hugetlb_cma_reserve(PUD_SHIFT - PAGE_SHIFT);



	check_initrd();

	reserve_crashkernel();