summaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2013-06-18 20:03:30 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-06-18 20:05:48 +0100
commitb3f288de7c8add67a3364e989b865b6537838662 (patch)
tree389c80ae471e4e24f25e6c38862a89ee5d833d86 /arch/arm/Kconfig
parent04e71d72abec3e1a2b2ac10f96ced1a471ecb3aa (diff)
parent8d962507007357d6fbbcbdd1647faa389a9aed6d (diff)
downloadblackbird-op-linux-b3f288de7c8add67a3364e989b865b6537838662.tar.gz
blackbird-op-linux-b3f288de7c8add67a3364e989b865b6537838662.zip
Merge branch 'for-rmk/hugepages' of git://git.linaro.org/people/stevecapper/linux into devel-stable
These changes bring both HugeTLB support and Transparent HugePage (THP) support to ARM. Only long descriptors (LPAE) are supported in this series. The code has been tested on an Arndale board (Exynos 5250).
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig8
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index ec38cacb3d08..aba657a9d3a6 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1707,6 +1707,14 @@ config HW_PERF_EVENTS
Enable hardware performance counter support for perf events. If
disabled, perf events will use software events only.
+config SYS_SUPPORTS_HUGETLBFS
+ def_bool y
+ depends on ARM_LPAE
+
+config HAVE_ARCH_TRANSPARENT_HUGEPAGE
+ def_bool y
+ depends on ARM_LPAE
+
source "mm/Kconfig"
config FORCE_MAX_ZONEORDER
OpenPOWER on IntegriCloud