diff options
| author | Tejun Heo <tj@kernel.org> | 2010-01-04 19:17:33 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2010-01-04 19:17:33 -0500 |
| commit | 32032df6c2f6c9c6b2ada2ce42322231824f70c2 (patch) | |
| tree | b1ce838a37044bb38dfc128e2116ca35630e629a /arch/cris/include/asm/elf.h | |
| parent | 22b737f4c75197372d64afc6ed1bccd58c00e549 (diff) | |
| parent | c5974b835a909ff15c3b7e6cf6789b5eb919f419 (diff) | |
Merge branch 'master' into percpu
Conflicts:
arch/powerpc/platforms/pseries/hvCall.S
include/linux/percpu.h
Diffstat (limited to 'arch/cris/include/asm/elf.h')
| -rw-r--r-- | arch/cris/include/asm/elf.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/cris/include/asm/elf.h b/arch/cris/include/asm/elf.h index 0f51b10b9f4f..8a3d8e2b33c1 100644 --- a/arch/cris/include/asm/elf.h +++ b/arch/cris/include/asm/elf.h | |||
| @@ -64,8 +64,6 @@ typedef unsigned long elf_fpregset_t; | |||
| 64 | #define EF_CRIS_VARIANT_COMMON_V10_V32 0x00000004 | 64 | #define EF_CRIS_VARIANT_COMMON_V10_V32 0x00000004 |
| 65 | /* End of excerpt from {binutils}/include/elf/cris.h. */ | 65 | /* End of excerpt from {binutils}/include/elf/cris.h. */ |
| 66 | 66 | ||
| 67 | #define USE_ELF_CORE_DUMP | ||
| 68 | |||
| 69 | #define ELF_EXEC_PAGESIZE 8192 | 67 | #define ELF_EXEC_PAGESIZE 8192 |
| 70 | 68 | ||
| 71 | /* This is the location that an ET_DYN program is loaded if exec'ed. Typical | 69 | /* This is the location that an ET_DYN program is loaded if exec'ed. Typical |