diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2018-04-24 22:06:43 -0400 |
---|---|---|
committer | Eric W. Biederman <ebiederm@xmission.com> | 2018-04-26 20:51:13 -0400 |
commit | 36a4ca3d9b5205819e4c47686cafb4e9b7ae76d3 (patch) | |
tree | 2c033280b11047cae951ac3603b75a4d09dafc77 | |
parent | 76b7f670730e87974f71df9f6129811e2769666e (diff) |
signal: Remove unncessary #ifdef SEGV_PKUERR in 32bit compat code
The only architecture that does not support SEGV_PKUERR is ia64 and
ia64 has not had 32bit support since some time in 2008. Therefore
copy_siginfo_to_user32 and copy_siginfo_from_user32 do not need to
include support for a missing SEGV_PKUERR.
Compile test on ia64.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
-rw-r--r-- | kernel/signal.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/kernel/signal.c b/kernel/signal.c index b87a9c21f698..376b42f26e6d 100644 --- a/kernel/signal.c +++ b/kernel/signal.c | |||
@@ -2888,12 +2888,9 @@ int __copy_siginfo_to_user32(struct compat_siginfo __user *to, | |||
2888 | new.si_lower = ptr_to_compat(from->si_lower); | 2888 | new.si_lower = ptr_to_compat(from->si_lower); |
2889 | new.si_upper = ptr_to_compat(from->si_upper); | 2889 | new.si_upper = ptr_to_compat(from->si_upper); |
2890 | } | 2890 | } |
2891 | #ifdef SEGV_PKUERR | ||
2892 | if ((from->si_signo == SIGSEGV) && | 2891 | if ((from->si_signo == SIGSEGV) && |
2893 | (from->si_code == SEGV_PKUERR)) | 2892 | (from->si_code == SEGV_PKUERR)) |
2894 | new.si_pkey = from->si_pkey; | 2893 | new.si_pkey = from->si_pkey; |
2895 | #endif | ||
2896 | |||
2897 | break; | 2894 | break; |
2898 | case SIL_CHLD: | 2895 | case SIL_CHLD: |
2899 | new.si_pid = from->si_pid; | 2896 | new.si_pid = from->si_pid; |
@@ -2968,10 +2965,8 @@ int copy_siginfo_from_user32(struct siginfo *to, | |||
2968 | to->si_lower = compat_ptr(from.si_lower); | 2965 | to->si_lower = compat_ptr(from.si_lower); |
2969 | to->si_upper = compat_ptr(from.si_upper); | 2966 | to->si_upper = compat_ptr(from.si_upper); |
2970 | } | 2967 | } |
2971 | #ifdef SEGV_PKUERR | ||
2972 | if ((from.si_signo == SIGSEGV) && (from.si_code == SEGV_PKUERR)) | 2968 | if ((from.si_signo == SIGSEGV) && (from.si_code == SEGV_PKUERR)) |
2973 | to->si_pkey = from.si_pkey; | 2969 | to->si_pkey = from.si_pkey; |
2974 | #endif | ||
2975 | break; | 2970 | break; |
2976 | case SIL_CHLD: | 2971 | case SIL_CHLD: |
2977 | to->si_pid = from.si_pid; | 2972 | to->si_pid = from.si_pid; |