From c6b96708478ad0d49ec52f002c3c19f99874d3e5 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Tue, 24 Jun 2008 03:48:28 +1000
Subject: [PATCH] --- yaml --- r: 101711 b: refs/heads/master c:
 178f8d78fdeaace8b22a759a059b74f39caf23a4 h: refs/heads/master i:   101709:
 5c482b12b173d678de12aef0bbab3d3b5af50a37   101707:
 9ba07ef41f404a48d114756a439ae3b2b1b36afd   101703:
 8cc994586d68b0cd3adb18d4accbb997b21fb91e   101695:
 a88e8af52d1b8b957a8d41c1a84b58a4fa8f823d v: v3

---
 [refs]                          |  2 +-
 trunk/include/asm-powerpc/elf.h | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index f0c5be024401..0e0de6f716b0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d1cdcf2241723d6596d56abb8777b5ef79b4a878
+refs/heads/master: 178f8d78fdeaace8b22a759a059b74f39caf23a4
diff --git a/trunk/include/asm-powerpc/elf.h b/trunk/include/asm-powerpc/elf.h
index 9080d85cb9d0..d1e3bda0625d 100644
--- a/trunk/include/asm-powerpc/elf.h
+++ b/trunk/include/asm-powerpc/elf.h
@@ -224,8 +224,6 @@ extern int dump_task_altivec(struct task_struct *, elf_vrregset_t *vrregs);
 #define ELF_CORE_XFPREG_TYPE NT_PPC_VMX
 #endif
 
-#endif /* __KERNEL__ */
-
 /* ELF_HWCAP yields a mask that user programs can use to figure out what
    instruction set this cpu supports.  This could be done in userspace,
    but it's not easy, and we've already done it here.  */
@@ -243,8 +241,6 @@ extern int dump_task_altivec(struct task_struct *, elf_vrregset_t *vrregs);
 } while (0)
 #endif /* __powerpc64__ */
 
-#ifdef __KERNEL__
-
 #ifdef __powerpc64__
 # define SET_PERSONALITY(ex, ibcs2)				\
 do {								\
@@ -272,8 +268,6 @@ do {								\
 # define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX)
 #endif /* __powerpc64__ */
 
-#endif /* __KERNEL__ */
-
 extern int dcache_bsize;
 extern int icache_bsize;
 extern int ucache_bsize;
@@ -285,6 +279,8 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
 				       int executable_stack);
 #define VDSO_AUX_ENT(a,b) NEW_AUX_ENT(a,b);
 
+#endif /* __KERNEL__ */
+
 /*
  * The requirements here are:
  * - keep the final alignment of sp (sp & 0xf)
@@ -422,6 +418,8 @@ do {									\
 /* Keep this the last entry.  */
 #define R_PPC64_NUM		107
 
+#ifdef  __KERNEL__
+
 #ifdef CONFIG_SPU_BASE
 /* Notes used in ET_CORE. Note name is "SPU/<fd>/<filename>". */
 #define NT_SPU		1
@@ -430,4 +428,6 @@ do {									\
 
 #endif /* CONFIG_SPU_BASE */
 
+#endif /* __KERNEL */
+
 #endif /* _ASM_POWERPC_ELF_H */