diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-29 17:49:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-29 17:49:45 -0400 |
| commit | 50483c3268918ee51a56d1baa39b9149d2d0d521 (patch) | |
| tree | 2fb9c927c319628ebddfd118c10df3e626bdd1c4 /arch/s390 | |
| parent | 7fda0412c5f7afdd1a5ff518f98dee5157266d8a (diff) | |
| parent | 1631fcea8399da5e80a80084b3b8c5bfd99d21e7 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
Pull arch/tile (really asm-generic) update from Chris Metcalf:
"These are a couple of asm-generic changes that apply to tile."
* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
compat: use sys_sendfile64() implementation for sendfile syscall
[PATCH v3] ipc: provide generic compat versions of IPC syscalls
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 465d5be1f0f..2b7c0fbe578 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig | |||
| @@ -219,6 +219,7 @@ config COMPAT | |||
| 219 | prompt "Kernel support for 31 bit emulation" | 219 | prompt "Kernel support for 31 bit emulation" |
| 220 | depends on 64BIT | 220 | depends on 64BIT |
| 221 | select COMPAT_BINFMT_ELF | 221 | select COMPAT_BINFMT_ELF |
| 222 | select ARCH_WANT_OLD_COMPAT_IPC | ||
| 222 | help | 223 | help |
| 223 | Select this option if you want to enable your system kernel to | 224 | Select this option if you want to enable your system kernel to |
| 224 | handle system-calls from ELF binaries for 31 bit ESA. This option | 225 | handle system-calls from ELF binaries for 31 bit ESA. This option |