diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-10 12:30:09 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-10 12:30:09 -0400 |
| commit | 85ca7886f566ae387a57a37bc0ffab25e3e117b5 (patch) | |
| tree | d170966b3352b3463669492648861795aad0fb92 /include/trace | |
| parent | 7c8d20d40f29e7c08332d406d7a65678dece4627 (diff) | |
| parent | 16106822b67e0a5eb228aebf47e33d6cad1e91b6 (diff) | |
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
tracing: Fix null pointer deref with SEND_SIG_FORCED
perf: Fix signed comparison in perf_adjust_period()
powerpc/oprofile: fix potential buffer overrun in op_model_cell.c
perf symbols: Set the DSO long name when using symbol_conf.vmlinux_name
Diffstat (limited to 'include/trace')
| -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 @@ | |||
| 10 | 10 | ||
| 11 | #define TP_STORE_SIGINFO(__entry, info) \ | 11 | #define TP_STORE_SIGINFO(__entry, info) \ |
| 12 | do { \ | 12 | do { \ |
| 13 | if (info == SEND_SIG_NOINFO) { \ | 13 | if (info == SEND_SIG_NOINFO || \ |
| 14 | info == SEND_SIG_FORCED) { \ | ||
| 14 | __entry->errno = 0; \ | 15 | __entry->errno = 0; \ |
| 15 | __entry->code = SI_USER; \ | 16 | __entry->code = SI_USER; \ |
| 16 | } else if (info == SEND_SIG_PRIV) { \ | 17 | } else if (info == SEND_SIG_PRIV) { \ |