diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-25 05:37:07 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-25 05:37:07 -0400 |
| commit | 0e2f65ee30eee2db054f7fd73f462c5da33ec963 (patch) | |
| tree | 26c61eb7745da0c0d9135e9d12088f570cb8530d /include/asm-x86/ptrace-abi.h | |
| parent | da7878d75b8520c9ae00d27dfbbce546a7bfdfbb (diff) | |
| parent | fb2e405fc1fc8b20d9c78eaa1c7fd5a297efde43 (diff) | |
Merge branch 'linus' into x86/pebs
Conflicts:
arch/x86/Kconfig.cpu
arch/x86/kernel/cpu/intel.c
arch/x86/kernel/setup_64.c
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 9bcaa75cbcaf..3397817eded9 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 | #ifdef CONFIG_X86_PTRACE_BTS | 83 | #ifdef CONFIG_X86_PTRACE_BTS |