From 77d0af8a3522269cb967da9c4c68cb24584a253194dbd2966ac72f1ae6b5872d Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Fri, 19 Dec 2008 14:18:43 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/systemtap?expand=0&rev=33

---
 systemtap-use-send_signal.diff | 85 ++++++++++++++++++++++++++++++++++
 systemtap.changes              |  5 ++
 systemtap.spec                 |  6 ++-
 3 files changed, 95 insertions(+), 1 deletion(-)
 create mode 100644 systemtap-use-send_signal.diff

diff --git a/systemtap-use-send_signal.diff b/systemtap-use-send_signal.diff
new file mode 100644
index 0000000..48cdb57
--- /dev/null
+++ b/systemtap-use-send_signal.diff
@@ -0,0 +1,85 @@
+From: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
+Date: Mon, 24 Nov 2008 07:50:49 +0000 (+0530)
+Subject: Fix for 7030: use send_signal instead of generic_send_sig_info and specific_send_sig_info
+X-Git-Url: http://sources.redhat.com/git/gitweb.cgi?p=systemtap.git;a=commitdiff_plain;h=563c89d9c8828590941c9a5bee7fa3edc62cbee8
+
+Fix for 7030: use send_signal instead of generic_send_sig_info and specific_send_sig_info
+(Prasad's Patch for fixing signal tapset)
+---
+
+diff --git a/tapset/signal.stp b/tapset/signal.stp
+index 66de767..7f932e7 100644
+--- a/tapset/signal.stp
++++ b/tapset/signal.stp
+@@ -49,6 +49,7 @@ probe signal.send = _signal.send.*
+         si_code="SI_USER or SI_TIMER or SI_ASYNCIO"
+ }
+ 
++%( kernel_v <= "2.6.25" %?
+ probe _signal.send.part1 = kernel.function("__group_send_sig_info")
+ {
+     name = "__group_send_sig_info"
+@@ -59,7 +60,6 @@ probe _signal.send.part1 = kernel.function("__group_send_sig_info")
+     send2queue = 0
+ }
+ 
+-%( kernel_v <= "2.6.25" %?
+ probe _signal.send.part2 = kernel.function("send_group_sigqueue")
+ {
+     name = "send_group_sigqueue"
+@@ -69,6 +69,38 @@ probe _signal.send.part2 = kernel.function("send_group_sigqueue")
+     shared = 1
+     send2queue = 1
+ }
++
++probe _signal.send.part4 = kernel.function("specific_send_sig_info")
++{
++    name = "specific_send_sig_info"
++    sig = $sig
++    task = $t
++    sinfo = $info
++    shared = 0
++    send2queue = 0
++}
++%)
++
++%( kernel_v > "2.6.25" %?
++probe _signal.send.part1 = kernel.function("send_signal")
++{
++    name = "__group_send_sig_info"
++    sig = $sig
++    task = $t
++    sinfo = $info
++    shared = 1
++    send2queue = 0
++}
++
++probe _signal.send.part4 = kernel.function("send_signal")
++{
++    name = "specific_send_sig_info"
++    sig = $sig
++    task = $t
++    sinfo = $info
++    shared = 0
++    send2queue = 0
++}
+ %)
+ 
+ probe _signal.send.part3 = kernel.function("send_sigqueue")
+@@ -86,16 +118,6 @@ probe _signal.send.part3 = kernel.function("send_sigqueue")
+     send2queue = 1
+ }
+ 
+-probe _signal.send.part4 = kernel.function("specific_send_sig_info")
+-{
+-    name = "specific_send_sig_info"
+-    sig = $sig
+-    task = $t
+-    sinfo = $info
+-    shared = 0
+-    send2queue = 0
+-}
+-
+ /* probe signal.send.return
+  */
+ probe signal.send.return = _signal.send.*.return
diff --git a/systemtap.changes b/systemtap.changes
index 2b7511c..4803716 100644
--- a/systemtap.changes
+++ b/systemtap.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Dec 18 16:59:23 CET 2008 - tiwai@suse.de
+
+- Fix stap failures with signal tapsets (bnc#459387)
+
 -------------------------------------------------------------------
 Tue Dec 16 13:50:32 CET 2008 - tiwai@suse.de
 
diff --git a/systemtap.spec b/systemtap.spec
index cc4160a..b7f8016 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -25,7 +25,7 @@ BuildRequires:  latex2html
 %define package_version  20080906
 License:        GPL v2 or later
 Version:        0.7.1
-Release:        28
+Release:        29
 Summary:        Instrumentation System
 Group:          Development/Tools/Debuggers
 Url:            http://sourceware.org/systemtap/
@@ -40,6 +40,7 @@ Patch5:         systemtap-dwarf_getsrcfiles-no-assert.diff
 Patch6:         systemtap-netcat-fix1.diff
 Patch7:         systemtap-netcat-fix2.diff
 Patch8:         systemtap-2.6.28-fixes.diff
+Patch9:         systemtap-use-send_signal.diff
 Requires:       libebl1
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -68,6 +69,7 @@ Authors:
 %patch6 -p1
 %patch7 -p1
 %patch8
+%patch9 -p1
 
 %build
 autoreconf -fi
@@ -96,6 +98,8 @@ rm -rf ${RPM_BUILD_ROOT}
 %dir %attr(0755,root,root) /var/cache/systemtap
 
 %changelog
+* Thu Dec 18 2008 tiwai@suse.de
+- Fix stap failures with signal tapsets (bnc#459387)
 * Tue Dec 16 2008 tiwai@suse.de
 - Fix dependency on libebl1 (bnc#448331, #445783)
 - Fix stap for 2.6.28 kernels