From 36e7327a491c3898d8183772bad0e5aaab42c758 Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Mon, 24 Jan 2011 12:19:11 -0500 Subject: [PATCH] adapt to droppage of CLONE_STOPPED from 2.6.38-rc* --- clonestopped.patch | 20 ++++++++++++++++++++ systemtap.spec | 7 ++++++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 clonestopped.patch diff --git a/clonestopped.patch b/clonestopped.patch new file mode 100644 index 0000000..81b883b --- /dev/null +++ b/clonestopped.patch @@ -0,0 +1,20 @@ +commit b30b7ed14e6734e0b5b216729aad0e465412c4b1 +Author: Lukas Berk +Date: Mon Jan 24 12:09:29 2011 -0500 + + adding #ifdef CLONE_STOPPED to stop module compilation error + +diff --git a/tapset/aux_syscalls.stp b/tapset/aux_syscalls.stp +index e9a9750..25ca345 100644 +--- a/tapset/aux_syscalls.stp ++++ b/tapset/aux_syscalls.stp +@@ -1616,7 +1616,9 @@ static const _stp_val_array const _stp_fork_list[] = { + V(CLONE_DETACHED), + V(CLONE_UNTRACED), + V(CLONE_CHILD_SETTID), ++#ifdef CLONE_STOPPED + V(CLONE_STOPPED), ++#endif + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19) + V(CLONE_NEWUTS), + V(CLONE_NEWIPC), diff --git a/systemtap.spec b/systemtap.spec index c9b8fb6..51532ef 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -16,7 +16,7 @@ Name: systemtap Version: 1.4 -Release: 2%{?dist} +Release: 3%{?dist} # for version, see also configure.ac Summary: Instrumentation System Group: Development/System @@ -57,6 +57,7 @@ BuildRequires: m4 BuildRequires: elfutils-devel >= %{elfutils_version} %endif Patch2: sdt-regtable.patch +Patch3: clonestopped.patch %if %{with_docs} BuildRequires: /usr/bin/latex /usr/bin/dvips /usr/bin/ps2pdf latex2html @@ -182,6 +183,7 @@ data from SystemTap instrumentation scripts. %setup -q %{?setup_elfutils} %patch2 -p1 +%patch3 -p1 %if %{with_bundled_elfutils} cd elfutils-%{elfutils_version} @@ -517,6 +519,9 @@ exit 0 %changelog +* Mon Jan 19 2011 Frank Ch. Eigler - 1.4-3 +- adapt to kernel CLONE_STOPPED deprecation + * Mon Jan 19 2011 Stan Cox - 1.4-2 - sdt fixes