x86: PTRACE_SINGLEBLOCK

This adds the PTRACE_SINGLEBLOCK request on x86, matching the ia64 feature.
The implementation comes from the generic ptrace code and relies on the
low-level machine support provided by arch_has_block_step() et al.

Signed-off-by: Roland McGrath <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
Signed-off-by: Thomas Gleixner <[email protected]>

diff --git a/arch/x86/ia32/ptrace32.c b/arch/x86/ia32/ptrace32.c
index 5ababea1307add0ca2cc4d13fef3b87340e0f649..8c6fb9d8352b25da2c31d4cbe0dc504af4179265 100644 (file)
--- a/arch/x86/ia32/ptrace32.c
+++ b/arch/x86/ia32/ptrace32.c
@@ -227,6 +227,7 @@ asmlinkage long sys32_ptrace(long request, u32 pid, u32 addr, u32 data)
        case PTRACE_KILL:
        case PTRACE_CONT:
        case PTRACE_SINGLESTEP:
+       case PTRACE_SINGLEBLOCK:
        case PTRACE_DETACH:
        case PTRACE_SYSCALL:
        case PTRACE_OLDSETOPTIONS:

diff --git a/include/asm-x86/ptrace-abi.h b/include/asm-x86/ptrace-abi.h
index 7524e12338332d6ee54fc472086caa2babb29c2a..adce6b51df2e6fc9aa886e8b5ecd99848c0df60b 100644 (file)
--- a/include/asm-x86/ptrace-abi.h
+++ b/include/asm-x86/ptrace-abi.h
@@ -78,4 +78,6 @@
 # define PTRACE_SYSEMU_SINGLESTEP 32
 #endif
 
+#define PTRACE_SINGLEBLOCK     33      /* resume execution until next branch */
+
 #endif