X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=include%2Fasm-sparc%2Felf.h;h=d043f80bc2fd4b858a260c91d00e1592bc780caf;hb=50346e621252617a07eb800dfa3f876ccd52d534;hp=83a3dd15a6edffa502634290d3d3b4d910bf85de;hpb=2a2ed2db353d949c06b6ef8b6913f65b39111eab;p=linux-2.6-omap-h63xx.git

diff --git a/include/asm-sparc/elf.h b/include/asm-sparc/elf.h
index 83a3dd15a6e..d043f80bc2f 100644
--- a/include/asm-sparc/elf.h
+++ b/include/asm-sparc/elf.h
@@ -1,4 +1,3 @@
-/* $Id: elf.h,v 1.22 2000/07/12 01:27:08 davem Exp $ */
 #ifndef __ASMSPARC_ELF_H
 #define __ASMSPARC_ELF_H
 
@@ -8,11 +7,6 @@
 
 #include <asm/ptrace.h>
 
-#ifdef __KERNEL__
-#include <asm/mbus.h>
-#include <asm/uaccess.h>
-#endif
-
 /*
  * Sparc section types
  */
@@ -70,12 +64,7 @@
 #define HWCAP_SPARC_V9		16
 #define HWCAP_SPARC_ULTRA3	32
 
-/* For the most part we present code dumps in the format
- * Solaris does.
- */
-typedef unsigned long elf_greg_t;
-#define ELF_NGREG 38
-typedef elf_greg_t elf_gregset_t[ELF_NGREG];
+#define CORE_DUMP_USE_REGSET
 
 /* Format is:
  * 	G0 --> G7
@@ -84,22 +73,9 @@ typedef elf_greg_t elf_gregset_t[ELF_NGREG];
  *	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 colon. */
+typedef unsigned long elf_greg_t;
+#define ELF_NGREG 38
+typedef elf_greg_t elf_gregset_t[ELF_NGREG];
 
 typedef struct {
 	union {
@@ -114,8 +90,7 @@ typedef struct {
 	unsigned int	pr_q[64];
 } elf_fpregset_t;
 
-#define ELF_CORE_COPY_TASK_REGS(__tsk, __elf_regs)	\
-	({ ELF_CORE_COPY_REGS((*(__elf_regs)), (__tsk)->thread.kregs); 1; })
+#include <asm/mbus.h>
 
 /*
  * This is used to ensure we don't load something for the wrong architecture.
@@ -165,8 +140,6 @@ typedef struct {
 
 #define ELF_PLATFORM	(NULL)
 
-#ifdef __KERNEL__
 #define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX)
-#endif
 
 #endif /* !(__ASMSPARC_ELF_H) */