patch-process_c 1.3 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849
  1. --- strace-4.8.orig/process.c 2013-05-18 00:22:19.000000000 +0200
  2. +++ strace-4.8/process.c 2014-02-25 20:02:55.000000000 +0100
  3. @@ -55,7 +55,7 @@
  4. # endif
  5. #endif
  6. -#ifdef HAVE_LINUX_PTRACE_H
  7. +#if defined(HAVE_LINUX_PTRACE_H) && defined(__GLIBC__)
  8. # undef PTRACE_SYSCALL
  9. # ifdef HAVE_STRUCT_IA64_FPREG
  10. # define ia64_fpreg XXX_ia64_fpreg
  11. @@ -104,6 +104,10 @@
  12. # include <asm/rse.h>
  13. #endif
  14. +#ifdef __arm__
  15. +#include <asm/ptrace.h>
  16. +#endif
  17. +
  18. #ifdef HAVE_PRCTL
  19. # include <sys/prctl.h>
  20. @@ -2857,7 +2861,7 @@ sys_sched_setscheduler(struct tcb *tcp)
  21. if (umove(tcp, tcp->u_arg[2], &p) < 0)
  22. tprintf(", %#lx", tcp->u_arg[2]);
  23. else
  24. - tprintf(", { %d }", p.__sched_priority);
  25. + tprintf(", { %d }", p.sched_priority);
  26. }
  27. return 0;
  28. }
  29. @@ -2872,7 +2876,7 @@ sys_sched_getparam(struct tcb *tcp)
  30. if (umove(tcp, tcp->u_arg[1], &p) < 0)
  31. tprintf("%#lx", tcp->u_arg[1]);
  32. else
  33. - tprintf("{ %d }", p.__sched_priority);
  34. + tprintf("{ %d }", p.sched_priority);
  35. }
  36. return 0;
  37. }
  38. @@ -2885,7 +2889,7 @@ sys_sched_setparam(struct tcb *tcp)
  39. if (umove(tcp, tcp->u_arg[1], &p) < 0)
  40. tprintf("%d, %#lx", (int) tcp->u_arg[0], tcp->u_arg[1]);
  41. else
  42. - tprintf("%d, { %d }", (int) tcp->u_arg[0], p.__sched_priority);
  43. + tprintf("%d, { %d }", (int) tcp->u_arg[0], p.sched_priority);
  44. }
  45. return 0;
  46. }