linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / asm-s390 / elf.h

diff --git a/include/asm-s390/elf.h b/include/asm-s390/elf.h
index c0d629d..710646e 100644 (file)
--- a/include/asm-s390/elf.h
+++ b/include/asm-s390/elf.h
@@ -92,30 +92,29 @@
 /* Keep this the last entry.  */
 #define R_390_NUM      61
 
-/*
- * These are used to set parameters in the core dumps.
- */
-#ifndef __s390x__
-#define ELF_CLASS      ELFCLASS32
-#else /* __s390x__ */
-#define ELF_CLASS      ELFCLASS64
-#endif /* __s390x__ */
-#define ELF_DATA       ELFDATA2MSB
-#define ELF_ARCH       EM_S390
-
 /*
  * ELF register definitions..
  */
 
+#include <linux/sched.h>       /* for task_struct */
 #include <asm/ptrace.h>
 #include <asm/user.h>
+#include <asm/system.h>                /* for save_access_regs */
+
 
 typedef s390_fp_regs elf_fpregset_t;
 typedef s390_regs elf_gregset_t;
 
-#ifdef __KERNEL__
-#include <linux/sched.h>       /* for task_struct */
-#include <asm/system.h>                /* for save_access_regs */
+/*
+ * These are used to set parameters in the core dumps.
+ */
+#ifndef __s390x__
+#define ELF_CLASS      ELFCLASS32
+#else /* __s390x__ */
+#define ELF_CLASS      ELFCLASS64
+#endif /* __s390x__ */
+#define ELF_DATA       ELFDATA2MSB
+#define ELF_ARCH       EM_S390
 
 /*
  * This is used to ensure we don't load something for the wrong architecture.
@@ -199,6 +198,7 @@ static inline int dump_task_fpu(struct task_struct *tsk, elf_fpregset_t *fpregs)
 
 #define ELF_PLATFORM (NULL)
 
+#ifdef __KERNEL__
 #ifndef __s390x__
 #define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX)
 #else /* __s390x__ */