summaryrefslogtreecommitdiffstats
path: root/arch/arm64/include/asm/elf.h
diff options
context:
space:
mode:
authorJoel Stanley <joel@jms.id.au>2016-07-22 14:00:50 +0930
committerJoel Stanley <joel@jms.id.au>2016-07-22 14:00:50 +0930
commit48be0c57f9c5f5c197fba129924709660a23a4a0 (patch)
tree4601cbecb454dfab02631248b7bb8eb5d239c165 /arch/arm64/include/asm/elf.h
parentb951233aa15e85d43aed2421e0adac1a2abc5770 (diff)
parent35467dc7630af60abacc330f64029d081f160530 (diff)
downloadtalos-obmc-linux-48be0c57f9c5f5c197fba129924709660a23a4a0.tar.gz
talos-obmc-linux-48be0c57f9c5f5c197fba129924709660a23a4a0.zip
Merge tag 'v4.4.15' into dev-4.4
This is the 4.4.15 stable release
Diffstat (limited to 'arch/arm64/include/asm/elf.h')
-rw-r--r--arch/arm64/include/asm/elf.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h
index faad6df49e5b..bc6492b9a924 100644
--- a/arch/arm64/include/asm/elf.h
+++ b/arch/arm64/include/asm/elf.h
@@ -156,14 +156,14 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
#define STACK_RND_MASK (0x3ffff >> (PAGE_SHIFT - 12))
#endif
-#ifdef CONFIG_COMPAT
-
#ifdef __AARCH64EB__
#define COMPAT_ELF_PLATFORM ("v8b")
#else
#define COMPAT_ELF_PLATFORM ("v8l")
#endif
+#ifdef CONFIG_COMPAT
+
#define COMPAT_ELF_ET_DYN_BASE (2 * TASK_SIZE_32 / 3)
/* AArch32 registers. */
OpenPOWER on IntegriCloud