summaryrefslogtreecommitdiff
path: root/arch/arm/mm/Makefile
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2013-06-18 23:03:30 +0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-06-18 23:05:48 +0400
commitb3f288de7c8add67a3364e989b865b6537838662 (patch)
tree389c80ae471e4e24f25e6c38862a89ee5d833d86 /arch/arm/mm/Makefile
parent04e71d72abec3e1a2b2ac10f96ced1a471ecb3aa (diff)
parent8d962507007357d6fbbcbdd1647faa389a9aed6d (diff)
downloadlinux-b3f288de7c8add67a3364e989b865b6537838662.tar.xz
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/mm/Makefile')
-rw-r--r--arch/arm/mm/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mm/Makefile b/arch/arm/mm/Makefile
index ee558a01f390..ecfe6e53f6e0 100644
--- a/arch/arm/mm/Makefile
+++ b/arch/arm/mm/Makefile
@@ -16,6 +16,7 @@ obj-$(CONFIG_MODULES) += proc-syms.o
obj-$(CONFIG_ALIGNMENT_TRAP) += alignment.o
obj-$(CONFIG_HIGHMEM) += highmem.o
+obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
obj-$(CONFIG_CPU_ABRT_NOMMU) += abort-nommu.o
obj-$(CONFIG_CPU_ABRT_EV4) += abort-ev4.o