2 files changed, 8 insertions, 37 deletions

diff --git a/include/asm-sparc/elf.h b/include/asm-sparc/elf.h
index 668814e1e539..d2516eed3a38 100644
--- a/include/asm-sparc/elf.h
+++ b/include/asm-sparc/elf.h
@@ -65,8 +65,14 @@
 #define HWCAP_SPARC_V9          16
 #define HWCAP_SPARC_ULTRA3      32
 
-/* For the most part we present code dumps in the format
- * Solaris does.
+#define CORE_DUMP_USE_REGSET
+
+/* Format is:
+ *      G0 --> G7
+ *      O0 --> O7
+ *      L0 --> L7
+ *      I0 --> I7
+ *      PSR, PC, nPC, Y, WIM, TBR
  */
 typedef unsigned long elf_greg_t;
 #define ELF_NGREG 38
@@ -86,34 +92,6 @@ typedef struct {
 } elf_fpregset_t;
 
 #include <asm/mbus.h>
-#include <asm/uaccess.h>
-
-/* Format is:
- *      G0 --> G7
- *      O0 --> O7
- *      L0 --> L7
- *      I0 --> I7
- *      PSR, PC, nPC, Y, WIM, TBR
- */
-#define ELF_CORE_COPY_REGS(__elf_regs, __pt_regs)       \
-do {    unsigned long *dest = &(__elf_regs[0]);         \
-        struct pt_regs *src = (__pt_regs);              \
-        unsigned long __user *sp;                       \
-        memcpy(&dest[0], &src->u_regs[0],               \
-               sizeof(unsigned long) * 16);             \
-        /* Don't try this at home kids... */            \
-        sp = (unsigned long __user *) src->u_regs[14];  \
-        copy_from_user(&dest[16], sp,                   \
-                       sizeof(unsigned long) * 16);     \
-        dest[32] = src->psr;                            \
-        dest[33] = src->pc;                             \
-        dest[34] = src->npc;                            \
-        dest[35] = src->y;                              \
-        dest[36] = dest[37] = 0; /* XXX */              \
-} while(0); /* Janitors: Don't touch this semicolon. */
-
-#define ELF_CORE_COPY_TASK_REGS(__tsk, __elf_regs)      \
-        ({ ELF_CORE_COPY_REGS((*(__elf_regs)), (__tsk)->thread.kregs); 1; })
 
 /*
  * This is used to ensure we don't load something for the wrong architecture.
diff --git a/include/asm-sparc/ptrace.h b/include/asm-sparc/ptrace.h
index 714497099a42..8201a7b29d49 100644
--- a/include/asm-sparc/ptrace.h
+++ b/include/asm-sparc/ptrace.h
@@ -61,8 +61,6 @@ struct sparc_stackf {
 
 #ifdef __KERNEL__
 
-#define __ARCH_SYS_PTRACE       1
-
 #define user_mode(regs) (!((regs)->psr & PSR_PS))
 #define instruction_pointer(regs) ((regs)->pc)
 unsigned long profile_pc(struct pt_regs *);
@@ -151,8 +149,6 @@ extern void show_regs(struct pt_regs *);
 #define SF_XXARG  0x5c
 
 /* Stuff for the ptrace system call */
-#define PTRACE_SUNATTACH          10
-#define PTRACE_SUNDETACH          11
 #define PTRACE_GETREGS            12
 #define PTRACE_SETREGS            13
 #define PTRACE_GETFPREGS          14
@@ -164,7 +160,4 @@ extern void show_regs(struct pt_regs *);
 #define PTRACE_GETFPAREGS         20
 #define PTRACE_SETFPAREGS         21
 
-#define PTRACE_GETUCODE           29  /* stupid bsd-ism */
-
-
 #endif /* !(_SPARC_PTRACE_H) */