summaryrefslogtreecommitdiffstats
path: root/arch/sh/include
diff options
context:
space:
mode:
authorThomas Schwinge <thomas@codesourcery.com>2012-11-16 10:46:20 +0100
committerPaul Mundt <lethal@linux-sh.org>2013-01-11 21:02:57 +0900
commit4a71997a3279a339e7336ea5d0cd27282e2dea44 (patch)
tree22fef4495a6a023726c621dccdfdc83cd5bc6d5c /arch/sh/include
parent5a799b824b6046befa7e10107a3d65f40816f645 (diff)
downloadop-kernel-dev-4a71997a3279a339e7336ea5d0cd27282e2dea44.zip
op-kernel-dev-4a71997a3279a339e7336ea5d0cd27282e2dea44.tar.gz
sh: Fix FDPIC binary loader
Ensure that the aux table is properly initialized, even when optional features are missing. Without this, the FDPIC loader did not work. This was meant to be included in commit d5ab780305bb6d60a7b5a74f18cf84eb6ad153b1. Signed-off-by: Thomas Schwinge <thomas@codesourcery.com> Cc: stable@vger.kernel.org Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/include')
-rw-r--r--arch/sh/include/asm/elf.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/include/asm/elf.h b/arch/sh/include/asm/elf.h
index 37924af..bf9f44f 100644
--- a/arch/sh/include/asm/elf.h
+++ b/arch/sh/include/asm/elf.h
@@ -203,9 +203,9 @@ extern void __kernel_vsyscall;
if (vdso_enabled) \
NEW_AUX_ENT(AT_SYSINFO_EHDR, VDSO_BASE); \
else \
- NEW_AUX_ENT(AT_IGNORE, 0);
+ NEW_AUX_ENT(AT_IGNORE, 0)
#else
-#define VSYSCALL_AUX_ENT
+#define VSYSCALL_AUX_ENT NEW_AUX_ENT(AT_IGNORE, 0)
#endif /* CONFIG_VSYSCALL */
#ifdef CONFIG_SH_FPU
OpenPOWER on IntegriCloud