diff options
| author | Romain Naour <romain.naour@gmail.com> | 2016-08-21 20:25:36 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-08-21 22:22:39 +0200 |
| commit | 25b248b7e6af754703d22eab4cd2a0024f1ea2c7 (patch) | |
| tree | e59f8f34622d265442094b2c6ba265fcebfc3824 | |
| parent | 614710f4c3a82d60a7590ec55d14459d81f3764b (diff) | |
| download | buildroot-25b248b7e6af754703d22eab4cd2a0024f1ea2c7.tar.gz buildroot-25b248b7e6af754703d22eab4cd2a0024f1ea2c7.zip | |
package/trace-cmd: fix build without ptrace
Backport upstream patch.
Fixes:
http://autobuild.buildroot.net/results/78c/78ca1819cdecce81336cadca17762fde8276d13a
Signed-off-by: Romain Naour <romain.naour@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
| -rw-r--r-- | package/trace-cmd/0001-trace-cmd-Fix-trace-record.c-with-non-ptrace-compile.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/package/trace-cmd/0001-trace-cmd-Fix-trace-record.c-with-non-ptrace-compile.patch b/package/trace-cmd/0001-trace-cmd-Fix-trace-record.c-with-non-ptrace-compile.patch new file mode 100644 index 0000000000..5f7d2bab71 --- /dev/null +++ b/package/trace-cmd/0001-trace-cmd-Fix-trace-record.c-with-non-ptrace-compile.patch @@ -0,0 +1,32 @@ +From bdfcddd4f135dc1d4fefb0373d9ebb93ef5110cb Mon Sep 17 00:00:00 2001 +From: "Steven Rostedt (Red Hat)" <rostedt@goodmis.org> +Date: Mon, 7 Dec 2015 16:41:19 -0500 +Subject: [PATCH] trace-cmd: Fix trace-record.c with non ptrace compile + +Fix ptrace_wait() when NO_PTRACE=1 is defined. + +Status: upstream + +Signed-off-by: Steven Rostedt <rostedt@goodmis.org> +[Romain backport to 2.6] +Signed-off-by: Romain Naour <romain.naour@gmail.com> +--- + trace-record.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/trace-record.c b/trace-record.c +index df82883..f83ec4b 100644 +--- a/trace-record.c ++++ b/trace-record.c +@@ -1099,7 +1099,7 @@ static void ptrace_wait(enum trace_type type, int main_pid) + (!WIFEXITED(status) || pid != main_pid)); + } + #else +-static inline void ptrace_wait(int main_pid) { } ++static inline void ptrace_wait(enum trace_type type, int main_pid) { } + static inline void enable_ptrace(void) { } + static inline void ptrace_attach(int pid) { } + +-- +2.5.5 + |
