Commit e4362d1e authored Jan 21, 2014 by Alex Smith Committed by Ralf Baechle Mar 18, 2014

MIPS: Fix possible build error with transparent hugepages enabled



If CONFIG_TRANSPARENT_HUGEPAGE is enabled, but CONFIG_HUGETLB_PAGE is not,
it is possible to end up with a configuration that fails to build with the
following error:

include/linux/huge_mm.h:125:2: error: #error "hugepages can't be allocated by the buddy allocator"

This is due to CONFIG_FORCE_MAX_ZONEORDER defaulting to 11. It already has
ranges that change the valid values when HUGETLB_PAGE is enabled, but this
is not done for TRANSPARENT_HUGEPAGE. Fix by changing the HUGETLB_PAGE
dependencies to MIPS_HUGE_TLB_SUPPORT, which includes both
TRANSPARENT_HUGEPAGE and HUGETLB_PAGE.

Signed-off-by: Alex Smith <alex.smith@imgtec.com>
Reviewed-by: Markos Chandras <markos.chandras@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/6391/


Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

parent 9a15c944

arch/mips/Kconfig

+6 −6

Original line number	Diff line number	Diff line
		@@ -1776,12 +1776,12 @@ endchoice

		config FORCE_MAX_ZONEORDER
		int "Maximum zone order"
		range 14 64 if HUGETLB_PAGE && PAGE_SIZE_64KB
		default "14" if HUGETLB_PAGE && PAGE_SIZE_64KB
		range 13 64 if HUGETLB_PAGE && PAGE_SIZE_32KB
		default "13" if HUGETLB_PAGE && PAGE_SIZE_32KB
		range 12 64 if HUGETLB_PAGE && PAGE_SIZE_16KB
		default "12" if HUGETLB_PAGE && PAGE_SIZE_16KB
		range 14 64 if MIPS_HUGE_TLB_SUPPORT && PAGE_SIZE_64KB
		default "14" if MIPS_HUGE_TLB_SUPPORT && PAGE_SIZE_64KB
		range 13 64 if MIPS_HUGE_TLB_SUPPORT && PAGE_SIZE_32KB
		default "13" if MIPS_HUGE_TLB_SUPPORT && PAGE_SIZE_32KB
		range 12 64 if MIPS_HUGE_TLB_SUPPORT && PAGE_SIZE_16KB
		default "12" if MIPS_HUGE_TLB_SUPPORT && PAGE_SIZE_16KB
		range 11 64
		default "11"
		help

Admin message