diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2006-07-10 04:45:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-10 13:24:26 -0700 |
| commit | f84dfe82962759f3355eacc8e377361bb77b5274 (patch) | |
| tree | 300bdc6e0551457ebc84f4cdfe1c292960a62409 /arch | |
| parent | 289fbc21ea5ac445dfb4326090b1912387e849b5 (diff) | |
| download | linux-3.10-f84dfe82962759f3355eacc8e377361bb77b5274.tar.gz linux-3.10-f84dfe82962759f3355eacc8e377361bb77b5274.tar.bz2 linux-3.10-f84dfe82962759f3355eacc8e377361bb77b5274.zip | |
[PATCH] s390: remove BINFMT_ELF32 config option
Remove BINFMT_ELF32 config option. Support should be always compiled in if
CONFIG_COMPAT is set.
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/s390/Kconfig | 7 | ||||
| -rw-r--r-- | arch/s390/kernel/Makefile | 4 |
2 files changed, 2 insertions, 9 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 4dc9b2d14b9..ae071a11ce7 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -118,13 +118,6 @@ config SYSVIPC_COMPAT depends on COMPAT && SYSVIPC default y -config BINFMT_ELF32 - bool "Kernel support for 31 bit ELF binaries" - depends on COMPAT - help - This allows you to run 32-bit Linux/ELF binaries on your zSeries - in 64 bit mode. Everybody wants this; say Y. - comment "Code generation options" choice diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile index eabf00a6f77..86601a94570 100644 --- a/arch/s390/kernel/Makefile +++ b/arch/s390/kernel/Makefile @@ -17,8 +17,8 @@ obj-$(CONFIG_MODULES) += s390_ksyms.o module.o obj-$(CONFIG_SMP) += smp.o obj-$(CONFIG_COMPAT) += compat_linux.o compat_signal.o \ - compat_wrapper.o compat_exec_domain.o -obj-$(CONFIG_BINFMT_ELF32) += binfmt_elf32.o + compat_wrapper.o compat_exec_domain.o \ + binfmt_elf32.o obj-$(CONFIG_VIRT_TIMER) += vtime.o obj-$(CONFIG_STACKTRACE) += stacktrace.o |