diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-21 10:18:14 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-21 10:18:14 -0400 |
| commit | 91fa47964165a42401fbc1f41caa63ab78564305 (patch) | |
| tree | 8f4ffdcbdedd845563630c3bcacd9407c75ccb52 /include/asm-s390/elf.h | |
| parent | 56965536b8056f57830219efbba4b85218d96d6c (diff) | |
| parent | e478bec0ba0a83a48a0f6982934b6de079e7e6b3 (diff) | |
| download | op-kernel-dev-91fa47964165a42401fbc1f41caa63ab78564305.zip op-kernel-dev-91fa47964165a42401fbc1f41caa63ab78564305.tar.gz | |
Merge branch 'master' into gfs2
Diffstat (limited to 'include/asm-s390/elf.h')
| -rw-r--r-- | include/asm-s390/elf.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/include/asm-s390/elf.h b/include/asm-s390/elf.h index 710646e..c0d629d 100644 --- a/include/asm-s390/elf.h +++ b/include/asm-s390/elf.h @@ -93,19 +93,6 @@ #define R_390_NUM 61 /* - * 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; - -/* * These are used to set parameters in the core dumps. */ #ifndef __s390x__ @@ -117,6 +104,20 @@ typedef s390_regs elf_gregset_t; #define ELF_ARCH EM_S390 /* + * ELF register definitions.. + */ + +#include <asm/ptrace.h> +#include <asm/user.h> + +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 */ + +/* * This is used to ensure we don't load something for the wrong architecture. */ #define elf_check_arch(x) \ @@ -198,7 +199,6 @@ 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__ */ |
