Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

[android-sdk/kernel-video.git] / arch / cris / include / asm / ptrace.h

diff --git a/arch/cris/include/asm/ptrace.h b/arch/cris/include/asm/ptrace.h
index 551c081ab62b07dbf015bd18644ac55c60ab2eeb..9e788d04a4ef1b9c5d956f578fe4ee53b3bb9c2a 100644 (file)
--- a/arch/cris/include/asm/ptrace.h
+++ b/arch/cris/include/asm/ptrace.h
@@ -1,9 +1,8 @@
 #ifndef _CRIS_PTRACE_H
 #define _CRIS_PTRACE_H
 
-#include <arch/ptrace.h>
+#include <uapi/asm/ptrace.h>
 
-#ifdef __KERNEL__
 
 /* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */
 #define PTRACE_GETREGS            12
@@ -12,6 +11,4 @@
 #define profile_pc(regs) instruction_pointer(regs)
 #define current_user_stack_pointer() rdusp()
 
-#endif /* __KERNEL__ */
-
 #endif /* _CRIS_PTRACE_H */