From 4997629593cdc535bde1ddea418a6c75197865cf Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@infradead.org>
Date: Fri, 20 Oct 2006 00:29:33 -0700
Subject: [PATCH] --- yaml --- r: 40063 b: refs/heads/master c:
 6cf431d77c3e917399a847e3a7ec239d5163056b h: refs/heads/master i:   40061:
 8db679fd776d887a319fb22c523c45b5448baf52   40059:
 73eebfabaeada8c7c5348f860999b8e30181021e   40055:
 0332910656f9264b63fa518a9da05f1554856483   40047:
 c9b9da4687e6e32c5b7ceb87cb7ebceba961f467   40031:
 18b265a5672dfcffc27c3da0dec103415a384a6f   39999:
 b493e6528bf96122bbc47784fb8999de67f05a89   39935:
 b6c8e1c1af01857c4703b74ccc9f998722120c20 v: v3

---
 [refs]                        |  2 +-
 trunk/include/asm-sparc/elf.h | 41 +++++++++++++++++------------------
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/[refs] b/[refs]
index 2402e6e3c489..e2e15e0b62ab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6bda57365a5fda4743d83a5987c6aab66e90771c
+refs/heads/master: 6cf431d77c3e917399a847e3a7ec239d5163056b
diff --git a/trunk/include/asm-sparc/elf.h b/trunk/include/asm-sparc/elf.h
index 83a3dd15a6ed..aaf6ef40ee2f 100644
--- a/trunk/include/asm-sparc/elf.h
+++ b/trunk/include/asm-sparc/elf.h
@@ -8,11 +8,6 @@
 
 #include <asm/ptrace.h>
 
-#ifdef __KERNEL__
-#include <asm/mbus.h>
-#include <asm/uaccess.h>
-#endif
-
 /*
  * Sparc section types
  */
@@ -77,6 +72,23 @@ typedef unsigned long elf_greg_t;
 #define ELF_NGREG 38
 typedef elf_greg_t elf_gregset_t[ELF_NGREG];
 
+typedef struct {
+	union {
+		unsigned long	pr_regs[32];
+		double		pr_dregs[16];
+	} pr_fr;
+	unsigned long __unused;
+	unsigned long	pr_fsr;
+	unsigned char	pr_qcnt;
+	unsigned char	pr_q_entrysize;
+	unsigned char	pr_en;
+	unsigned int	pr_q[64];
+} elf_fpregset_t;
+
+#ifdef __KERNEL__
+#include <asm/mbus.h>
+#include <asm/uaccess.h>
+
 /* Format is:
  * 	G0 --> G7
  *	O0 --> O7
@@ -99,20 +111,7 @@ do {	unsigned long *dest = &(__elf_regs[0]);		\
 	dest[34] = src->npc;				\
 	dest[35] = src->y;				\
 	dest[36] = dest[37] = 0; /* XXX */		\
-} while(0); /* Janitors: Don't touch this colon. */
-
-typedef struct {
-	union {
-		unsigned long	pr_regs[32];
-		double		pr_dregs[16];
-	} pr_fr;
-	unsigned long __unused;
-	unsigned long	pr_fsr;
-	unsigned char	pr_qcnt;
-	unsigned char	pr_q_entrysize;
-	unsigned char	pr_en;
-	unsigned int	pr_q[64];
-} elf_fpregset_t;
+} 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; })
@@ -165,8 +164,8 @@ typedef struct {
 
 #define ELF_PLATFORM	(NULL)
 
-#ifdef __KERNEL__
 #define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX)
-#endif
+
+#endif /* __KERNEL__ */
 
 #endif /* !(__ASMSPARC_ELF_H) */