Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/urgent

This commit is contained in:
Ingo Molnar
2010-06-09 00:45:53 +02:00

View File

@@ -10,7 +10,8 @@
#define TP_STORE_SIGINFO(__entry, info) \ #define TP_STORE_SIGINFO(__entry, info) \
do { \ do { \
if (info == SEND_SIG_NOINFO) { \ if (info == SEND_SIG_NOINFO || \
info == SEND_SIG_FORCED) { \
__entry->errno = 0; \ __entry->errno = 0; \
__entry->code = SI_USER; \ __entry->code = SI_USER; \
} else if (info == SEND_SIG_PRIV) { \ } else if (info == SEND_SIG_PRIV) { \