1 files changed, 3 insertions, 47 deletions
diff --git a/arch/nios2/include/uapi/asm/ptrace.h b/arch/nios2/include/uapi/asm/ptrace.h
index e83a7c9d1c36..71a330597adf 100644
--- a/arch/nios2/include/uapi/asm/ptrace.h
+++ b/arch/nios2/include/uapi/asm/ptrace.h
@@ -67,53 +67,9 @@
 #define NUM_PTRACE_REG (PTR_TLBMISC + 1)
-/* this struct defines the way the registers are stored on the
+/* User structures for general purpose registers.  */
-   stack during a system call.
+struct user_pt_regs {
+        __u32           regs[49];
-   There is a fake_regs in setup.c that has to match pt_regs.*/
-struct pt_regs {
-        unsigned long  r8;              /* r8-r15 Caller-saved GP registers */
-        unsigned long  r9;
-        unsigned long  r10;
-        unsigned long  r11;
-        unsigned long  r12;
-        unsigned long  r13;
-        unsigned long  r14;
-        unsigned long  r15;
-        unsigned long  r1;              /* Assembler temporary */
-        unsigned long  r2;              /* Retval LS 32bits */
-        unsigned long  r3;              /* Retval MS 32bits */
-        unsigned long  r4;              /* r4-r7 Register arguments */
-        unsigned long  r5;
-        unsigned long  r6;
-        unsigned long  r7;
-        unsigned long  orig_r2;         /* Copy of r2 ?? */
-        unsigned long  ra;              /* Return address */
-        unsigned long  fp;              /* Frame pointer */
-        unsigned long  sp;              /* Stack pointer */
-        unsigned long  gp;              /* Global pointer */
-        unsigned long  estatus;
-        unsigned long  ea;              /* Exception return address (pc) */
-        unsigned long  orig_r7;
-};
-/*
- * This is the extended stack used by signal handlers and the context
- * switcher: it's pushed after the normal "struct pt_regs".
- */
-struct switch_stack {
-        unsigned long  r16;             /* r16-r23 Callee-saved GP registers */
-        unsigned long  r17;
-        unsigned long  r18;
-        unsigned long  r19;
-        unsigned long  r20;
-        unsigned long  r21;
-        unsigned long  r22;
-        unsigned long  r23;
-        unsigned long  fp;
-        unsigned long  gp;
-        unsigned long  ra;
 };
 #endif /* __ASSEMBLY__ */

diff --git a/arch/nios2/include/uapi/asm/ptrace.h b/arch/nios2/include/uapi/asm/ptrace.h index e83a7c9d1c36..71a330597adf 100644 --- a/arch/nios2/include/uapi/asm/ptrace.h +++ b/arch/nios2/include/uapi/asm/ptrace.h
@@ -67,53 +67,9 @@
67		67
68	#define NUM_PTRACE_REG (PTR_TLBMISC + 1)	68	#define NUM_PTRACE_REG (PTR_TLBMISC + 1)
69		69
70	/* this struct defines the way the registers are stored on the	70	/* User structures for general purpose registers. */
71	stack during a system call.	71	struct user_pt_regs {
72		72	__u32 regs[49];
73	There is a fake_regs in setup.c that has to match pt_regs.*/
74
75	struct pt_regs {
76	unsigned long r8; /* r8-r15 Caller-saved GP registers */
77	unsigned long r9;
78	unsigned long r10;
79	unsigned long r11;
80	unsigned long r12;
81	unsigned long r13;
82	unsigned long r14;
83	unsigned long r15;
84	unsigned long r1; /* Assembler temporary */
85	unsigned long r2; /* Retval LS 32bits */
86	unsigned long r3; /* Retval MS 32bits */
87	unsigned long r4; /* r4-r7 Register arguments */
88	unsigned long r5;
89	unsigned long r6;
90	unsigned long r7;
91	unsigned long orig_r2; /* Copy of r2 ?? */
92	unsigned long ra; /* Return address */
93	unsigned long fp; /* Frame pointer */
94	unsigned long sp; /* Stack pointer */
95	unsigned long gp; /* Global pointer */
96	unsigned long estatus;
97	unsigned long ea; /* Exception return address (pc) */
98	unsigned long orig_r7;
99	};
100
101	/*
102	* This is the extended stack used by signal handlers and the context
103	* switcher: it's pushed after the normal "struct pt_regs".
104	*/
105	struct switch_stack {
106	unsigned long r16; /* r16-r23 Callee-saved GP registers */
107	unsigned long r17;
108	unsigned long r18;
109	unsigned long r19;
110	unsigned long r20;
111	unsigned long r21;
112	unsigned long r22;
113	unsigned long r23;
114	unsigned long fp;
115	unsigned long gp;
116	unsigned long ra;
117	};	73	};
118		74
119	#endif /* __ASSEMBLY__ */	75	#endif /* __ASSEMBLY__ */