summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-06-09 00:45:53 +0200
committerIngo Molnar <mingo@elte.hu>2010-06-09 00:45:53 +0200
commit16106822b67e0a5eb228aebf47e33d6cad1e91b6 (patch)
tree3124f5392407cdbafe8a56bc2325853a96c1b993
parent84bb671dc46d77d665d2b5e74539e81b2129bb3e (diff)
parentb9b76dfaac6fa2c289ee8a005be637afd2da7e2f (diff)
downloadlinux-stable-16106822b67e0a5eb228aebf47e33d6cad1e91b6.tar.gz
linux-stable-16106822b67e0a5eb228aebf47e33d6cad1e91b6.tar.bz2
linux-stable-16106822b67e0a5eb228aebf47e33d6cad1e91b6.zip
Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/urgent
-rw-r--r--include/trace/events/signal.h3
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) { \