diff options
| author | David S. Miller <davem@nuts.ninka.net> | 2002-10-15 07:43:23 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2002-10-15 07:43:23 -0700 |
| commit | e52a90274e8ce78a43fc18e052b996d0d156baef (patch) | |
| tree | 6d19a625cea86dc2ac191b98fc62bbe73cf93390 /kernel | |
| parent | 5a7728c6d3eb83df9d120944cca4cf476dd326a1 (diff) | |
| parent | 130f7f9246884c8cbe92e68c54370a515482df10 (diff) | |
Merge nuts.ninka.net:/home/davem/src/BK/sparcwork-2.5
into nuts.ninka.net:/home/davem/src/BK/sparc-2.5
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/signal.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/signal.c b/kernel/signal.c index b037b12ce04b..17ba94f17942 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -1427,6 +1427,9 @@ int copy_siginfo_to_user(siginfo_t *to, siginfo_t *from) break; case __SI_FAULT: err |= __put_user(from->si_addr, &to->si_addr); +#ifdef __ARCH_SI_TRAPNO + err |= __put_user(from->si_trapno, &to->si_trapno); +#endif break; case __SI_CHLD: err |= __put_user(from->si_pid, &to->si_pid); |