aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCatalin Marinas <catalin.marinas@arm.com>2012-09-05 15:01:53 +0100
committerCatalin Marinas <catalin.marinas@arm.com>2012-09-05 16:20:05 +0100
commitb62bdfa8ac0e5c0628f49439f59dd13080dbb4e9 (patch)
treed4eff41275aaa710d24505c43050a6f9e8ffd05d
parent8b1990649bd260a080e2a39f8d53b952a35b89b2 (diff)
downloadlinux-aarch64-b62bdfa8ac0e5c0628f49439f59dd13080dbb4e9.tar.gz
fixup! arm64: Remove CONFIG_AARCH32_EMULATION Kconfig option
A previous patch removed the AARCH32_EMULATION checks throughout the kernel but missed the Kconfig entry. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
-rw-r--r--arch/arm64/Kconfig6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 5d6c9b0384b..767ba568545 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -189,7 +189,7 @@ menu "Userspace binary formats"
source "fs/Kconfig.binfmt"
-config AARCH32_EMULATION
+config COMPAT
bool "Kernel support for 32-bit EL0"
depends on !ARM64_64K_PAGES
select COMPAT_BINFMT_ELF
@@ -201,10 +201,6 @@ config AARCH32_EMULATION
If you want to execute 32-bit userspace applications, say Y.
-config COMPAT
- def_bool y
- depends on AARCH32_EMULATION
-
config SYSVIPC_COMPAT
def_bool y
depends on COMPAT && SYSVIPC