X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=arch%2Farm%2FKconfig;h=4b62f4caf0ce901fa08c863e2a3b71eaf517bd78;hb=d1fd836dcf00d2028c700c7e44d2c23404062c90;hp=cf4c0c99aa253f3f69ecc08a07f0c5a695e63640;hpb=462b69b1e43ceccab68a47d65b1e46520cd0fdc0;p=deliverable%2Flinux.git

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index cf4c0c99aa25..4b62f4caf0ce 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1,8 +1,8 @@
 config ARM
 	bool
 	default y
-	select ARCH_BINFMT_ELF_RANDOMIZE_PIE
 	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
+	select ARCH_HAS_ELF_RANDOMIZE
 	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
 	select ARCH_HAVE_CUSTOM_GPIO_H
 	select ARCH_HAS_GCOV_PROFILE_ALL
@@ -286,6 +286,11 @@ config GENERIC_BUG
 	def_bool y
 	depends on BUG
 
+config PGTABLE_LEVELS
+	int
+	default 3 if ARM_LPAE
+	default 2
+
 source "init/Kconfig"
 
 source "kernel/Kconfig.freezer"