From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 8 Jun 2010 22:45:53 +0000 (+0200)
Subject: Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic... 
X-Git-Tag: v2.6.35-rc4~2^2~9
X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=16106822b67e0a5eb228aebf47e33d6cad1e91b6;hp=84bb671dc46d77d665d2b5e74539e81b2129bb3e

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

diff --git a/include/trace/events/signal.h b/include/trace/events/signal.h
index 814566c..17df434 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) {		\