summaryrefslogtreecommitdiffstats
path: root/arch/arm/mm
diff options
context:
space:
mode:
authorCatalin Marinas <catalin.marinas@arm.com>2012-02-14 16:33:27 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-02-15 12:04:36 +0100
commit08a183f02b5fef1cd78d27ffc8281fa96d79f814 (patch)
tree37621a2e6d7fe0cfe85465cef425467d33767ff1 /arch/arm/mm
parentMerge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/brooni... (diff)
downloadlinux-08a183f02b5fef1cd78d27ffc8281fa96d79f814.tar.xz
linux-08a183f02b5fef1cd78d27ffc8281fa96d79f814.zip
ARM: 7323/1: Do not allow ARM_LPAE on pre-ARMv7 architectures
This patch expands the Kconfig dependencies for ARM_LPAE to not allow enabling when architectures other than ARMv7 are built into the kernel. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> Reported-by: Russell King <linux@arm.linux.org.uk> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mm')
-rw-r--r--arch/arm/mm/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index 1a3ca2488164..7edef9121632 100644
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -631,7 +631,8 @@ comment "Processor Features"
config ARM_LPAE
bool "Support for the Large Physical Address Extension"
- depends on MMU && CPU_V7
+ depends on MMU && CPU_32v7 && !CPU_32v6 && !CPU_32v5 && \
+ !CPU_32v4 && !CPU_32v3
help
Say Y if you have an ARMv7 processor supporting the LPAE page
table format and you would like to access memory beyond the