diff options
| author |   Steve French <sfrench@us.ibm.com> | 2010-06-16 13:19:36 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2010-06-16 13:19:36 +0000 |
| commit | 0933a95dfdb1ae5c93e1ede5899f35acc2bb244d (patch) | |
| tree | 55ac47b819a2a2084f82f9d823d9152ac2a7f2b3 /include/trace/events/signal.h | |
| parent | cifs: implement drop_inode superblock op (diff) | |
| parent | Linux 2.6.35-rc3 (diff) | |
| download | linux-dev-0933a95dfdb1ae5c93e1ede5899f35acc2bb244d.tar.xz linux-dev-0933a95dfdb1ae5c93e1ede5899f35acc2bb244d.zip | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/trace/events/signal.h')
| -rw-r--r-- | include/trace/events/signal.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/trace/events/signal.h b/include/trace/events/signal.h index 814566c99d29..17df43464df0 100644 --- a/include/trace/events/signal.h +++ b/include/trace/events/signal.h @@ -10,7 +10,8 @@ #define TP_STORE_SIGINFO(__entry, info) \ do { \ - if (info == SEND_SIG_NOINFO) { \ + if (info == SEND_SIG_NOINFO || \ + info == SEND_SIG_FORCED) { \ __entry->errno = 0; \ __entry->code = SI_USER; \ } else if (info == SEND_SIG_PRIV) { \ |