Merge tag 'disintegrate-misc-arches-20121010' of git://git.infradead.org/users/dhowel...

[firefly-linux-kernel-4.4.55.git] / arch / frv / include / asm / ptrace.h

diff --git a/arch/frv/include/asm/ptrace.h b/arch/frv/include/asm/ptrace.h
index bd534b2d02583e0c3f64a7d8d97f4a2f79d7dbf4..034f17934192d825463bc1a8c5fa12499ec0aa27 100644 (file)
--- a/arch/frv/include/asm/ptrace.h
+++ b/arch/frv/include/asm/ptrace.h
@@ -11,58 +11,10 @@
 #ifndef _ASM_PTRACE_H
 #define _ASM_PTRACE_H
 
-#include <asm/registers.h>
-#ifdef __KERNEL__
 #include <asm/irq_regs.h>
+#include <uapi/asm/ptrace.h>
 
 #define in_syscall(regs) (((regs)->tbr & TBR_TT) == TBR_TT_TRAP0)
-#endif
-
-
-#define PT_PSR         0
-#define        PT_ISR          1
-#define PT_CCR         2
-#define PT_CCCR                3
-#define PT_LR          4
-#define PT_LCR         5
-#define PT_PC          6
-
-#define PT__STATUS     7       /* exception status */
-#define PT_SYSCALLNO   8       /* syscall number or -1 */
-#define PT_ORIG_GR8    9       /* saved GR8 for signal handling */
-#define PT_GNER0       10
-#define PT_GNER1       11
-#define PT_IACC0H      12
-#define PT_IACC0L      13
-
-#define PT_GR(j)       ( 14 + (j))     /* GRj for 0<=j<=63 */
-#define PT_FR(j)       ( 78 + (j))     /* FRj for 0<=j<=63 */
-#define PT_FNER(j)     (142 + (j))     /* FNERj for 0<=j<=1 */
-#define PT_MSR(j)      (144 + (j))     /* MSRj for 0<=j<=2 */
-#define PT_ACC(j)      (146 + (j))     /* ACCj for 0<=j<=7 */
-#define PT_ACCG(jklm)  (154 + (jklm))  /* ACCGjklm for 0<=jklm<=1 (reads four regs per slot) */
-#define PT_FSR(j)      (156 + (j))     /* FSRj for 0<=j<=0 */
-#define PT__GPEND      78
-#define PT__END                157
-
-#define PT_TBR         PT_GR(0)
-#define PT_SP          PT_GR(1)
-#define PT_FP          PT_GR(2)
-#define PT_PREV_FRAME  PT_GR(28)       /* previous exception frame pointer (old gr28 value) */
-#define PT_CURR_TASK   PT_GR(29)       /* current task */
-
-
-/* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */
-#define PTRACE_GETREGS         12
-#define PTRACE_SETREGS         13
-#define PTRACE_GETFPREGS       14
-#define PTRACE_SETFPREGS       15
-#define PTRACE_GETFDPIC                31      /* get the ELF fdpic loadmap address */
-
-#define PTRACE_GETFDPIC_EXEC   0       /* [addr] request the executable loadmap */
-#define PTRACE_GETFDPIC_INTERP 1       /* [addr] request the interpreter loadmap */
-
-#ifdef __KERNEL__
 #ifndef __ASSEMBLY__
 
 struct task_struct;
@@ -86,5 +38,4 @@ extern unsigned long user_stack(const struct pt_regs *);
 #define arch_has_single_step() (1)
 
 #endif /* !__ASSEMBLY__ */
-#endif /* __KERNEL__ */
 #endif /* _ASM_PTRACE_H */