deepcrayon/buildroot
deepcrayon/buildroot
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

package/trace-cmd: fix build without ptrace

Browse source 
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>
This commit is contained in:
Romain Naour 2016-08-21 20:25:36 +02:00 committed by Thomas Petazzoni
parent 614710f4c3
commit 25b248b7e6
1 changed files with 32 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
package/trace-cmd/0001-trace-cmd-Fix-trace-record.c-with-non-ptrace-compile.patch Normal file
View file

@ -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