summaryrefslogtreecommitdiff
path: root/kernel/signal.c
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2017-07-31 15:47:40 -0500
committerEric W. Biederman <ebiederm@xmission.com>2018-01-12 14:34:47 -0600
commit30073566ca64cbc005f4fbcc21f0af7db83940a2 (patch)
tree2345b35720cb755769c7eaebf8b28f77a884a99f /kernel/signal.c
parent2eb50e2e9f624b1ce7263c51920a7871ae7e926f (diff)
downloadlwn-30073566ca64cbc005f4fbcc21f0af7db83940a2.tar.gz
lwn-30073566ca64cbc005f4fbcc21f0af7db83940a2.zip
signal/ia64: switch the last arch-specific copy_siginfo_to_user() to generic version
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'kernel/signal.c')
-rw-r--r--kernel/signal.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/kernel/signal.c b/kernel/signal.c
index 18aa55c1bb4f..62c642899290 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -2729,8 +2729,6 @@ enum siginfo_layout siginfo_layout(int sig, int si_code)
return layout;
}
-#ifndef HAVE_ARCH_COPY_SIGINFO_TO_USER
-
int copy_siginfo_to_user(siginfo_t __user *to, const siginfo_t *from)
{
int err;
@@ -2769,6 +2767,11 @@ int copy_siginfo_to_user(siginfo_t __user *to, const siginfo_t *from)
#ifdef __ARCH_SI_TRAPNO
err |= __put_user(from->si_trapno, &to->si_trapno);
#endif
+#ifdef __ia64__
+ err |= __put_user(from->si_imm, &to->si_imm);
+ err |= __put_user(from->si_flags, &to->si_flags);
+ err |= __put_user(from->si_isr, &to->si_isr);
+#endif
#ifdef BUS_MCEERR_AO
/*
* Other callers might not initialize the si_lsb field,
@@ -2812,8 +2815,6 @@ int copy_siginfo_to_user(siginfo_t __user *to, const siginfo_t *from)
return err;
}
-#endif
-
/**
* do_sigtimedwait - wait for queued signals specified in @which
* @which: queued signals to wait for