projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...
[powerpc.git]
/
include
/
asm-arm
/
elf.h
diff --git
a/include/asm-arm/elf.h
b/include/asm-arm/elf.h
index
2d44b42
..
17f0c65
100644
(file)
--- a/
include/asm-arm/elf.h
+++ b/
include/asm-arm/elf.h
@@
-1,7
+1,6
@@
#ifndef __ASMARM_ELF_H
#define __ASMARM_ELF_H
#ifndef __ASMARM_ELF_H
#define __ASMARM_ELF_H
-#include <linux/config.h>
/*
* ELF register definitions..
/*
* ELF register definitions..
@@
-9,7
+8,6
@@
#include <asm/ptrace.h>
#include <asm/user.h>
#include <asm/ptrace.h>
#include <asm/user.h>
-#include <asm/procinfo.h>
typedef unsigned long elf_greg_t;
typedef unsigned long elf_freg_t[3];
typedef unsigned long elf_greg_t;
typedef unsigned long elf_freg_t[3];
@@
-30,11
+28,6
@@
typedef elf_greg_t elf_gregset_t[ELF_NGREG];
typedef struct user_fp elf_fpregset_t;
typedef struct user_fp elf_fpregset_t;
-/*
- * This is used to ensure we don't load something for the wrong architecture.
- */
-#define elf_check_arch(x) ( ((x)->e_machine == EM_ARM) && (ELF_PROC_OK((x))) )
-
/*
* These are used to set parameters in the core dumps.
*/
/*
* These are used to set parameters in the core dumps.
*/
@@
-46,6
+39,14
@@
typedef struct user_fp elf_fpregset_t;
#endif
#define ELF_ARCH EM_ARM
#endif
#define ELF_ARCH EM_ARM
+#ifdef __KERNEL__
+#include <asm/procinfo.h>
+
+/*
+ * This is used to ensure we don't load something for the wrong architecture.
+ */
+#define elf_check_arch(x) ( ((x)->e_machine == EM_ARM) && (ELF_PROC_OK((x))) )
+
#define USE_ELF_CORE_DUMP
#define ELF_EXEC_PAGESIZE 4096
#define USE_ELF_CORE_DUMP
#define ELF_EXEC_PAGESIZE 4096
@@
-82,8
+83,6
@@
typedef struct user_fp elf_fpregset_t;
extern char elf_platform[];
#define ELF_PLATFORM (elf_platform)
extern char elf_platform[];
#define ELF_PLATFORM (elf_platform)
-#ifdef __KERNEL__
-
/*
* 32-bit code is always OK. Some cpus can do 26-bit, some can't.
*/
/*
* 32-bit code is always OK. Some cpus can do 26-bit, some can't.
*/