summaryrefslogtreecommitdiffstats
path: root/include/trace/events/signal.h
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2010-06-28 14:47:04 +0200
committerTony Lindgren <tony@atomide.com>2010-06-28 14:47:04 +0200
commit41bd03ba0758a076671e5de35ed084535984143d (patch)
tree9a669f9f1f52996b38acb077655e4b044bba67c7 /include/trace/events/signal.h
parentOMAP4: clock: Fix multi-omap boot with reset un-used clocks (diff)
parentOMAP: hwmod: Fix the missing braces (diff)
downloadlinux-41bd03ba0758a076671e5de35ed084535984143d.tar.xz
linux-41bd03ba0758a076671e5de35ed084535984143d.zip
Merge branch 'for_2.6.35rc' of git://git.pwsan.com/linux-2.6 into omap-fixes-for-linus
Diffstat (limited to 'include/trace/events/signal.h')
-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) { \