diff --git a/[refs] b/[refs] index e07db082a2cc..59ddc4de033b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aa9147c98f27550bd39416eca5a5844e54bced26 +refs/heads/master: 5cdf389aee90109e2e3d88085dea4dd5508a3be7 diff --git a/trunk/include/linux/ptrace.h b/trunk/include/linux/ptrace.h index 6f1260ee5be5..30be18064dfd 100644 --- a/trunk/include/linux/ptrace.h +++ b/trunk/include/linux/ptrace.h @@ -61,7 +61,8 @@ #define PTRACE_EVENT_EXEC 4 #define PTRACE_EVENT_VFORK_DONE 5 #define PTRACE_EVENT_EXIT 6 -#define PTRACE_EVENT_STOP 7 +/* Extended result codes which enabled by means other than options. */ +#define PTRACE_EVENT_STOP 128 /* options set using PTRACE_SETOPTIONS */ #define PTRACE_O_TRACESYSGOOD 1