diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 18:07:55 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 18:07:55 -0400 |
| commit | cb28a1bbdb4790378e7366d6c9ee1d2340b84f92 (patch) | |
| tree | 316436f77dac75335fd2c3ef5f109e71606c50d3 /include/asm-x86/ptrace-abi.h | |
| parent | b6d4f7e3ef25beb8c658c97867d98883e69dc544 (diff) | |
| parent | f934fb19ef34730263e6afc01e8ec27a8a71470f (diff) | |
Merge branch 'linus' into core/generic-dma-coherent
Conflicts:
arch/x86/Kconfig
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/ptrace-abi.h')
| -rw-r--r-- | include/asm-x86/ptrace-abi.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/ptrace-abi.h b/include/asm-x86/ptrace-abi.h index f224eb3c3157..72e7b9db29bb 100644 --- a/include/asm-x86/ptrace-abi.h +++ b/include/asm-x86/ptrace-abi.h | |||
| @@ -73,11 +73,11 @@ | |||
| 73 | 73 | ||
| 74 | #ifdef __x86_64__ | 74 | #ifdef __x86_64__ |
| 75 | # define PTRACE_ARCH_PRCTL 30 | 75 | # define PTRACE_ARCH_PRCTL 30 |
| 76 | #else | ||
| 77 | # define PTRACE_SYSEMU 31 | ||
| 78 | # define PTRACE_SYSEMU_SINGLESTEP 32 | ||
| 79 | #endif | 76 | #endif |
| 80 | 77 | ||
| 78 | #define PTRACE_SYSEMU 31 | ||
| 79 | #define PTRACE_SYSEMU_SINGLESTEP 32 | ||
| 80 | |||
| 81 | #define PTRACE_SINGLEBLOCK 33 /* resume execution until next branch */ | 81 | #define PTRACE_SINGLEBLOCK 33 /* resume execution until next branch */ |
| 82 | 82 | ||
| 83 | #ifndef __ASSEMBLY__ | 83 | #ifndef __ASSEMBLY__ |