diff options
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/compat.c | 8 | ||||
| -rw-r--r-- | kernel/sysctl.c | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/kernel/compat.c b/kernel/compat.c index 9214dcd087b7..fc9eb093acd5 100644 --- a/kernel/compat.c +++ b/kernel/compat.c | |||
| @@ -293,6 +293,8 @@ asmlinkage long compat_sys_times(struct compat_tms __user *tbuf) | |||
| 293 | return compat_jiffies_to_clock_t(jiffies); | 293 | return compat_jiffies_to_clock_t(jiffies); |
| 294 | } | 294 | } |
| 295 | 295 | ||
| 296 | #ifdef __ARCH_WANT_SYS_SIGPENDING | ||
| 297 | |||
| 296 | /* | 298 | /* |
| 297 | * Assumption: old_sigset_t and compat_old_sigset_t are both | 299 | * Assumption: old_sigset_t and compat_old_sigset_t are both |
| 298 | * types that can be passed to put_user()/get_user(). | 300 | * types that can be passed to put_user()/get_user(). |
| @@ -312,6 +314,10 @@ asmlinkage long compat_sys_sigpending(compat_old_sigset_t __user *set) | |||
| 312 | return ret; | 314 | return ret; |
| 313 | } | 315 | } |
| 314 | 316 | ||
| 317 | #endif | ||
| 318 | |||
| 319 | #ifdef __ARCH_WANT_SYS_SIGPROCMASK | ||
| 320 | |||
| 315 | asmlinkage long compat_sys_sigprocmask(int how, compat_old_sigset_t __user *set, | 321 | asmlinkage long compat_sys_sigprocmask(int how, compat_old_sigset_t __user *set, |
| 316 | compat_old_sigset_t __user *oset) | 322 | compat_old_sigset_t __user *oset) |
| 317 | { | 323 | { |
| @@ -333,6 +339,8 @@ asmlinkage long compat_sys_sigprocmask(int how, compat_old_sigset_t __user *set, | |||
| 333 | return ret; | 339 | return ret; |
| 334 | } | 340 | } |
| 335 | 341 | ||
| 342 | #endif | ||
| 343 | |||
| 336 | asmlinkage long compat_sys_setrlimit(unsigned int resource, | 344 | asmlinkage long compat_sys_setrlimit(unsigned int resource, |
| 337 | struct compat_rlimit __user *rlim) | 345 | struct compat_rlimit __user *rlim) |
| 338 | { | 346 | { |
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 4bffd62c2f13..4fc92445a29c 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
| @@ -1506,7 +1506,7 @@ static struct ctl_table fs_table[] = { | |||
| 1506 | 1506 | ||
| 1507 | static struct ctl_table debug_table[] = { | 1507 | static struct ctl_table debug_table[] = { |
| 1508 | #if defined(CONFIG_X86) || defined(CONFIG_PPC) || defined(CONFIG_SPARC) || \ | 1508 | #if defined(CONFIG_X86) || defined(CONFIG_PPC) || defined(CONFIG_SPARC) || \ |
| 1509 | defined(CONFIG_S390) | 1509 | defined(CONFIG_S390) || defined(CONFIG_TILE) |
| 1510 | { | 1510 | { |
| 1511 | .procname = "exception-trace", | 1511 | .procname = "exception-trace", |
| 1512 | .data = &show_unhandled_signals, | 1512 | .data = &show_unhandled_signals, |
