git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
include
/
asm-frv
/
elf.h
diff --git
a/include/asm-frv/elf.h
b/include/asm-frv/elf.h
index
7d2098f
..
7df58a3
100644
(file)
--- a/
include/asm-frv/elf.h
+++ b/
include/asm-frv/elf.h
@@
-12,7
+12,6
@@
#ifndef __ASM_ELF_H
#define __ASM_ELF_H
#ifndef __ASM_ELF_H
#define __ASM_ELF_H
-#include <linux/config.h>
#include <asm/ptrace.h>
#include <asm/user.h>
#include <asm/ptrace.h>
#include <asm/user.h>
@@
-65,7
+64,7
@@
typedef unsigned long elf_greg_t;
#define ELF_NGREG (sizeof(struct pt_regs) / sizeof(elf_greg_t))
typedef elf_greg_t elf_gregset_t[ELF_NGREG];
#define ELF_NGREG (sizeof(struct pt_regs) / sizeof(elf_greg_t))
typedef elf_greg_t elf_gregset_t[ELF_NGREG];
-typedef struct
fpmedia_struct
elf_fpregset_t;
+typedef struct
user_fpmedia_regs
elf_fpregset_t;
/*
* This is used to ensure we don't load something for the wrong architecture.
/*
* This is used to ensure we don't load something for the wrong architecture.
@@
-117,6
+116,7
@@
do { \
} while(0)
#define USE_ELF_CORE_DUMP
} while(0)
#define USE_ELF_CORE_DUMP
+#define ELF_FDPIC_CORE_EFLAGS EF_FRV_FDPIC
#define ELF_EXEC_PAGESIZE 16384
/* This is the location that an ET_DYN program is loaded if exec'ed. Typical
#define ELF_EXEC_PAGESIZE 16384
/* This is the location that an ET_DYN program is loaded if exec'ed. Typical
@@
-126,9
+126,6
@@
do { \
#define ELF_ET_DYN_BASE 0x08000000UL
#define ELF_ET_DYN_BASE 0x08000000UL
-#define ELF_CORE_COPY_REGS(pr_reg, regs) \
- memcpy(&pr_reg[0], ®s->sp, 31 * sizeof(uint32_t));
-
/* This yields a mask that user programs can use to figure out what
instruction set this cpu supports. */
/* This yields a mask that user programs can use to figure out what
instruction set this cpu supports. */