diff options
| author | Russell King | 2013-06-18 21:03:30 +0200 |
|---|---|---|
| committer | Russell King | 2013-06-18 21:05:48 +0200 |
| commit | b3f288de7c8add67a3364e989b865b6537838662 (patch) | |
| tree | 389c80ae471e4e24f25e6c38862a89ee5d833d86 /arch/arm/mm/Makefile | |
| parent | Merge branch 'ja-nommu-for-rmk-v2' of git://linux-arm.org/linux-ja into devel... (diff) | |
| parent | ARM: mm: Transparent huge page support for LPAE systems. (diff) | |
| download | kernel-qcow2-linux-b3f288de7c8add67a3364e989b865b6537838662.tar.gz kernel-qcow2-linux-b3f288de7c8add67a3364e989b865b6537838662.tar.xz kernel-qcow2-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/mm/Makefile')
| -rw-r--r-- | arch/arm/mm/Makefile | 1 |
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 |