arm64: ASLR: Don't randomise text when randomise_va_space == 0

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / arch / arm64 / Kconfig

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index c49ca4c..9532f8d 100644 (file)
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -1,5 +1,6 @@
 config ARM64
        def_bool y
+       select ARCH_BINFMT_ELF_RANDOMIZE_PIE
        select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
        select ARCH_HAS_SG_CHAIN
        select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
@@ -232,7 +233,7 @@ config ARM64_VA_BITS_42
 
 config ARM64_VA_BITS_48
        bool "48-bit"
-       depends on BROKEN
+       depends on !ARM_SMMU
 
 endchoice
 
@@ -349,7 +350,7 @@ config XEN_DOM0
        depends on XEN
 
 config XEN
-       bool "Xen guest support on ARM64 (EXPERIMENTAL)"
+       bool "Xen guest support on ARM64"
        depends on ARM64 && OF
        select SWIOTLB_XEN
        help