signal: Remove unncessary #ifdef SEGV_PKUERR in 32bit compat code
authorEric W. Biederman <ebiederm@xmission.com>
Wed, 25 Apr 2018 02:06:43 +0000 (21:06 -0500)
committerEric W. Biederman <ebiederm@xmission.com>
Fri, 27 Apr 2018 00:51:13 +0000 (19:51 -0500)
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>
kernel/signal.c

index b87a9c2..376b42f 100644 (file)
@@ -2888,12 +2888,9 @@ int __copy_siginfo_to_user32(struct compat_siginfo __user *to,
                        new.si_lower = ptr_to_compat(from->si_lower);
                        new.si_upper = ptr_to_compat(from->si_upper);
                }
-#ifdef SEGV_PKUERR
                if ((from->si_signo == SIGSEGV) &&
                    (from->si_code == SEGV_PKUERR))
                        new.si_pkey = from->si_pkey;
-#endif
-
                break;
        case SIL_CHLD:
                new.si_pid    = from->si_pid;
@@ -2968,10 +2965,8 @@ int copy_siginfo_from_user32(struct siginfo *to,
                        to->si_lower = compat_ptr(from.si_lower);
                        to->si_upper = compat_ptr(from.si_upper);
                }
-#ifdef SEGV_PKUERR
                if ((from.si_signo == SIGSEGV) && (from.si_code == SEGV_PKUERR))
                        to->si_pkey = from.si_pkey;
-#endif
                break;
        case SIL_CHLD:
                to->si_pid    = from.si_pid;