summaryrefslogtreecommitdiff
path: root/package/strace/patches/patch-process_c
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2013-10-25 13:01:35 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2013-10-25 13:01:35 +0200
commit6765a17f36ebd3493758f23d1170dbe01c86f406 (patch)
tree014e094eca5476a5e3e50a4edf9e6a277873bb82 /package/strace/patches/patch-process_c
parent82cce6038c7fc05bf1107613fc4b5d3ba8aceb83 (diff)
fix strace compile
Diffstat (limited to 'package/strace/patches/patch-process_c')
-rw-r--r--package/strace/patches/patch-process_c23
1 files changed, 19 insertions, 4 deletions
diff --git a/package/strace/patches/patch-process_c b/package/strace/patches/patch-process_c
index 7fa9541f1..133b42525 100644
--- a/package/strace/patches/patch-process_c
+++ b/package/strace/patches/patch-process_c
@@ -1,6 +1,21 @@
--- strace-4.8.orig/process.c 2013-05-18 00:22:19.000000000 +0200
-+++ strace-4.8/process.c 2013-08-14 08:47:15.000000000 +0200
-@@ -2857,7 +2857,7 @@ sys_sched_setscheduler(struct tcb *tcp)
++++ strace-4.8/process.c 2013-10-24 18:57:55.000000000 +0200
+@@ -56,14 +56,12 @@
+ #endif
+
+ #ifdef HAVE_LINUX_PTRACE_H
+-# undef PTRACE_SYSCALL
+ # ifdef HAVE_STRUCT_IA64_FPREG
+ # define ia64_fpreg XXX_ia64_fpreg
+ # endif
+ # ifdef HAVE_STRUCT_PT_ALL_USER_REGS
+ # define pt_all_user_regs XXX_pt_all_user_regs
+ # endif
+-# include <linux/ptrace.h>
+ # undef ia64_fpreg
+ # undef pt_all_user_regs
+ #endif
+@@ -2857,7 +2855,7 @@ sys_sched_setscheduler(struct tcb *tcp)
if (umove(tcp, tcp->u_arg[2], &p) < 0)
tprintf(", %#lx", tcp->u_arg[2]);
else
@@ -9,7 +24,7 @@
}
return 0;
}
-@@ -2872,7 +2872,7 @@ sys_sched_getparam(struct tcb *tcp)
+@@ -2872,7 +2870,7 @@ sys_sched_getparam(struct tcb *tcp)
if (umove(tcp, tcp->u_arg[1], &p) < 0)
tprintf("%#lx", tcp->u_arg[1]);
else
@@ -18,7 +33,7 @@
}
return 0;
}
-@@ -2885,7 +2885,7 @@ sys_sched_setparam(struct tcb *tcp)
+@@ -2885,7 +2883,7 @@ sys_sched_setparam(struct tcb *tcp)
if (umove(tcp, tcp->u_arg[1], &p) < 0)
tprintf("%d, %#lx", (int) tcp->u_arg[0], tcp->u_arg[1]);
else