summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoffer Dall <christoffer.dall@linaro.org>2014-10-10 11:14:30 +0100
committerCatalin Marinas <catalin.marinas@arm.com>2014-10-20 17:47:02 +0100
commit04f905a9569ca2b6964a35563f135fabbb2470bc (patch)
tree8adfd565c46d9d6687d80410eaeb6f766472edb4
parentf114040e3ea6e07372334ade75d1ee0775c355e1 (diff)
downloadlinux-04f905a9569ca2b6964a35563f135fabbb2470bc.tar.gz
linux-04f905a9569ca2b6964a35563f135fabbb2470bc.tar.bz2
linux-04f905a9569ca2b6964a35563f135fabbb2470bc.zip
arm64: Allow 48-bits VA space without ARM_SMMU
Now when KVM has been reworked to support 48-bits host VA space, we can allow systems to be configured with this option. However, the ARM SMMU driver also needs to be tweaked for 48-bit support so only allow the config option to be set when not including support for theSMMU. Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
-rw-r--r--arch/arm64/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index ac9afde76dea..b8053be1d803 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -232,7 +232,7 @@ config ARM64_VA_BITS_42
config ARM64_VA_BITS_48
bool "48-bit"
- depends on BROKEN
+ depends on !ARM_SMMU
endchoice