diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-06-18 20:03:30 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-06-18 20:05:48 +0100 |
commit | b3f288de7c8add67a3364e989b865b6537838662 (patch) | |
tree | 389c80ae471e4e24f25e6c38862a89ee5d833d86 /arch/mips/alchemy/board-gpr.c | |
parent | 04e71d72abec3e1a2b2ac10f96ced1a471ecb3aa (diff) | |
parent | 8d962507007357d6fbbcbdd1647faa389a9aed6d (diff) | |
download | talos-op-linux-b3f288de7c8add67a3364e989b865b6537838662.tar.gz talos-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/mips/alchemy/board-gpr.c')
-rw-r--r-- | arch/mips/alchemy/board-gpr.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/alchemy/board-gpr.c b/arch/mips/alchemy/board-gpr.c index cb0f6afb7389..9edc35ff8cf1 100644 --- a/arch/mips/alchemy/board-gpr.c +++ b/arch/mips/alchemy/board-gpr.c @@ -31,6 +31,7 @@ #include <linux/i2c.h> #include <linux/i2c-gpio.h> #include <asm/bootinfo.h> +#include <asm/idle.h> #include <asm/reboot.h> #include <asm/mach-au1x00/au1000.h> #include <prom.h> |