diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-23 21:50:11 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-23 21:50:11 -0500 |
commit | 9e2d59ad580d590134285f361a0e80f0e98c0207 (patch) | |
tree | f3232be75781484193413f32ec82c21f6d8eb76e /arch/s390/Kconfig | |
parent | 5ce1a70e2f00f0bce0cab57f798ca354b9496169 (diff) | |
parent | 235b80226b986dabcbba844968f7807866bd0bfe (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal
Pull signal handling cleanups from Al Viro:
"This is the first pile; another one will come a bit later and will
contain SYSCALL_DEFINE-related patches.
- a bunch of signal-related syscalls (both native and compat)
unified.
- a bunch of compat syscalls switched to COMPAT_SYSCALL_DEFINE
(fixing several potential problems with missing argument
validation, while we are at it)
- a lot of now-pointless wrappers killed
- a couple of architectures (cris and hexagon) forgot to save
altstack settings into sigframe, even though they used the
(uninitialized) values in sigreturn; fixed.
- microblaze fixes for delivery of multiple signals arriving at once
- saner set of helpers for signal delivery introduced, several
architectures switched to using those."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal: (143 commits)
x86: convert to ksignal
sparc: convert to ksignal
arm: switch to struct ksignal * passing
alpha: pass k_sigaction and siginfo_t using ksignal pointer
burying unused conditionals
make do_sigaltstack() static
arm64: switch to generic old sigaction() (compat-only)
arm64: switch to generic compat rt_sigaction()
arm64: switch compat to generic old sigsuspend
arm64: switch to generic compat rt_sigqueueinfo()
arm64: switch to generic compat rt_sigpending()
arm64: switch to generic compat rt_sigprocmask()
arm64: switch to generic sigaltstack
sparc: switch to generic old sigsuspend
sparc: COMPAT_SYSCALL_DEFINE does all sign-extension as well as SYSCALL_DEFINE
sparc: kill sign-extending wrappers for native syscalls
kill sparc32_open()
sparc: switch to use of generic old sigaction
sparc: switch sys_compat_rt_sigaction() to COMPAT_SYSCALL_DEFINE
mips: switch to generic sys_fork() and sys_clone()
...
Diffstat (limited to 'arch/s390/Kconfig')
-rw-r--r-- | arch/s390/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index b220e152aefa..f09ae7b0b4c5 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig | |||
@@ -137,6 +137,8 @@ config S390 | |||
137 | select INIT_ALL_POSSIBLE | 137 | select INIT_ALL_POSSIBLE |
138 | select KTIME_SCALAR if 32BIT | 138 | select KTIME_SCALAR if 32BIT |
139 | select MODULES_USE_ELF_RELA | 139 | select MODULES_USE_ELF_RELA |
140 | select OLD_SIGSUSPEND3 | ||
141 | select OLD_SIGACTION | ||
140 | select SYSCTL_EXCEPTION_TRACE | 142 | select SYSCTL_EXCEPTION_TRACE |
141 | select USE_GENERIC_SMP_HELPERS if SMP | 143 | select USE_GENERIC_SMP_HELPERS if SMP |
142 | select VIRT_CPU_ACCOUNTING | 144 | select VIRT_CPU_ACCOUNTING |
@@ -249,6 +251,7 @@ config COMPAT | |||
249 | depends on 64BIT | 251 | depends on 64BIT |
250 | select COMPAT_BINFMT_ELF if BINFMT_ELF | 252 | select COMPAT_BINFMT_ELF if BINFMT_ELF |
251 | select ARCH_WANT_OLD_COMPAT_IPC | 253 | select ARCH_WANT_OLD_COMPAT_IPC |
254 | select COMPAT_OLD_SIGACTION | ||
252 | help | 255 | help |
253 | Select this option if you want to enable your system kernel to | 256 | Select this option if you want to enable your system kernel to |
254 | handle system-calls from ELF binaries for 31 bit ESA. This option | 257 | handle system-calls from ELF binaries for 31 bit ESA. This option |