Merge branch 'linus' into x86/pebs

[linux-2.6-omap-h63xx.git] / include / asm-x86 / ptrace-abi.h

diff --git a/include/asm-x86/ptrace-abi.h b/include/asm-x86/ptrace-abi.h
index 9bcaa75cbcafa61e1e520b906051785e0f2cc1b6..3397817eded997c054286ea00a2081f9051f26ba 100644 (file)
--- a/include/asm-x86/ptrace-abi.h
+++ b/include/asm-x86/ptrace-abi.h
@@ -73,11 +73,11 @@
 
 #ifdef __x86_64__
 # define PTRACE_ARCH_PRCTL       30
-#else
-# define PTRACE_SYSEMU           31
-# define PTRACE_SYSEMU_SINGLESTEP 32
 #endif
 
+#define PTRACE_SYSEMU            31
+#define PTRACE_SYSEMU_SINGLESTEP  32
+
 #define PTRACE_SINGLEBLOCK     33      /* resume execution until next branch */
 
 #ifdef CONFIG_X86_PTRACE_BTS