diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-10 18:30:09 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-10 18:30:09 +0200 |
| commit | 85ca7886f566ae387a57a37bc0ffab25e3e117b5 (patch) | |
| tree | d170966b3352b3463669492648861795aad0fb92 /include | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
| parent | Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/f... (diff) | |
| download | linux-85ca7886f566ae387a57a37bc0ffab25e3e117b5.tar.xz linux-85ca7886f566ae387a57a37bc0ffab25e3e117b5.zip | |
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')
| -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) { \ |