diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-05-06 21:29:25 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-05-06 21:29:25 -0400 |
| commit | 1ed31d6db90d51010545921e59d369d2f92b7ac2 (patch) | |
| tree | 358a0b346bc8135cd5e53700eb44308b1a7c8c5b /arch/mips/include/asm/elf.h | |
| parent | ceba1abcb00b0ef0b1efcd715285f6e05523edef (diff) | |
| parent | 722154e4cacf015161efe60009ae9be23d492296 (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'arch/mips/include/asm/elf.h')
| -rw-r--r-- | arch/mips/include/asm/elf.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/mips/include/asm/elf.h b/arch/mips/include/asm/elf.h index e53d7bed5cda..ea77a42c5f8c 100644 --- a/arch/mips/include/asm/elf.h +++ b/arch/mips/include/asm/elf.h | |||
| @@ -310,6 +310,7 @@ do { \ | |||
| 310 | 310 | ||
| 311 | #endif /* CONFIG_64BIT */ | 311 | #endif /* CONFIG_64BIT */ |
| 312 | 312 | ||
| 313 | struct pt_regs; | ||
| 313 | struct task_struct; | 314 | struct task_struct; |
| 314 | 315 | ||
| 315 | extern void elf_dump_regs(elf_greg_t *, struct pt_regs *regs); | 316 | extern void elf_dump_regs(elf_greg_t *, struct pt_regs *regs); |
| @@ -367,4 +368,8 @@ extern const char *__elf_platform; | |||
| 367 | #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2) | 368 | #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2) |
| 368 | #endif | 369 | #endif |
| 369 | 370 | ||
| 371 | #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1 | ||
| 372 | struct linux_binprm; | ||
| 373 | extern int arch_setup_additional_pages(struct linux_binprm *bprm, | ||
| 374 | int uses_interp); | ||
| 370 | #endif /* _ASM_ELF_H */ | 375 | #endif /* _ASM_ELF_H */ |