diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-08-03 10:49:38 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-08-03 10:49:38 +0100 |
| commit | e35ac62d2202e31307c0f9b278a61e484c4727f2 (patch) | |
| tree | 53b86d6fbe1738df3a2cc7e6a892ff8861164e3a /arch/arm/include/asm | |
| parent | 24195cad3e00557da166d629c8b0fd2f984f2170 (diff) | |
| parent | 8c0cc8a5d90bc7373a7a9e7f7a40eb41f51e03fc (diff) | |
| download | blackbird-op-linux-e35ac62d2202e31307c0f9b278a61e484c4727f2.tar.gz blackbird-op-linux-e35ac62d2202e31307c0f9b278a61e484c4727f2.zip | |
Merge branch 'security-fixes' into fixes
Diffstat (limited to 'arch/arm/include/asm')
| -rw-r--r-- | arch/arm/include/asm/elf.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h index 9c9b30717fda..56211f2084ef 100644 --- a/arch/arm/include/asm/elf.h +++ b/arch/arm/include/asm/elf.h @@ -130,8 +130,10 @@ struct mm_struct; extern unsigned long arch_randomize_brk(struct mm_struct *mm); #define arch_randomize_brk arch_randomize_brk +#ifdef CONFIG_MMU #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1 struct linux_binprm; int arch_setup_additional_pages(struct linux_binprm *, int); +#endif #endif |
