From 73a610e6a9871d4e1c1fd2ae80f321fdfc1db261bb4dc6234e20907f68b38c89 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 5 Dec 2008 14:49:58 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemtap?expand=0&rev=30 --- systemtap-ioblock-fix.diff | 21 +++++++++++++++++++++ systemtap.changes | 5 +++++ systemtap.spec | 6 +++++- 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 systemtap-ioblock-fix.diff diff --git a/systemtap-ioblock-fix.diff b/systemtap-ioblock-fix.diff new file mode 100644 index 0000000..e6af39f --- /dev/null +++ b/systemtap-ioblock-fix.diff @@ -0,0 +1,21 @@ +--- tapset/ioblock.stp-dist 2008-12-04 18:02:22.000000000 +0100 ++++ tapset/ioblock.stp 2008-12-04 18:03:54.000000000 +0100 +@@ -122,7 +122,9 @@ + vcnt = $bio->bi_vcnt + idx = $bio->bi_idx + phys_segments = $bio->bi_phys_segments ++%(kernel_v < "2.6.27" %? + hw_segments = $bio->bi_hw_segments ++%) + size = $bio->bi_size + + bdev = $bio->bi_bdev +@@ -176,6 +178,8 @@ + vcnt = $bio->bi_vcnt + idx = $bio->bi_idx + phys_segments = $bio->bi_phys_segments ++%(kernel_v < "2.6.27" %? + hw_segments = $bio->bi_hw_segments ++%) + size = $bio->bi_size + } diff --git a/systemtap.changes b/systemtap.changes index 61f213c..de927f4 100644 --- a/systemtap.changes +++ b/systemtap.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Dec 4 18:08:23 CET 2008 - tiwai@suse.de + +- fix ioblock.stp for SUSE 2.6.27.x kernel (bnc#456175) + ------------------------------------------------------------------- Fri Nov 21 14:09:21 CET 2008 - tiwai@suse.de diff --git a/systemtap.spec b/systemtap.spec index c866705..f11ae75 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: 25 +Release: 26 Summary: Instrumentation System Group: Development/Tools/Debuggers Url: http://sourceware.org/systemtap/ @@ -36,6 +36,7 @@ Patch: systemtap-docdir-fix.diff Patch1: systemtap-old-autoconf-fix.diff Patch2: stap-fix-dump_unwindsyms.patch Patch3: systemtap-parameter-bound-check.diff +Patch4: systemtap-ioblock-fix.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -61,6 +62,7 @@ Authors: %endif %patch2 -p1 %patch3 +%patch4 %build autoreconf -fi @@ -85,6 +87,8 @@ rm -rf ${RPM_BUILD_ROOT} %dir %attr(0755,root,root) /var/cache/systemtap %changelog +* Thu Dec 04 2008 tiwai@suse.de +- fix ioblock.stp for SUSE 2.6.27.x kernel (bnc#456175) * Fri Nov 21 2008 tiwai@suse.de - Add the bound check of parameters to fix segfault (bnc#447551) * Tue Nov 04 2008 tiwai@suse.de