The patch titled
s390: remove BINFMT_ELF32 config option
has been added to the -mm tree. Its filename is
s390-remove-binfmt_elf32-config-option.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: s390: remove BINFMT_ELF32 config option
From: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Remove BINFMT_ELF32 config option. Support should be always compiled in if
CONFIG_COMPAT is set.
Cc: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Cc: Christoph Hellwig <hch@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/s390/Kconfig | 7 -------
arch/s390/kernel/Makefile | 4 ++--
2 files changed, 2 insertions(+), 9 deletions(-)
diff -puN arch/s390/Kconfig~s390-remove-binfmt_elf32-config-option arch/s390/Kconfig
--- a/arch/s390/Kconfig~s390-remove-binfmt_elf32-config-option
+++ a/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 -puN arch/s390/kernel/Makefile~s390-remove-binfmt_elf32-config-option arch/s390/kernel/Makefile
--- a/arch/s390/kernel/Makefile~s390-remove-binfmt_elf32-config-option
+++ a/arch/s390/kernel/Makefile
@@ -17,8 +17,8 @@ obj-$(CONFIG_MODULES) += s390_ksyms.o m
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
_
Patches currently in -mm which might be from heiko.carstens@xxxxxxxxxx are
vmstat-export-all_vm_events.patch
git-klibc.patch
git-s390.patch
s390-move-var-declarations-behind-ifdef.patch
fix-oddball-boolean-logic-in-s390-netiucv.patch
s390-broken-null-test-in-claw-driver.patch
s390-remove-binfmt_elf32-config-option.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
