aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Schwinge <thomas@codesourcery.com>2012-11-16 10:46:20 +0100
committerBen Hutchings <ben@decadent.org.uk>2013-02-06 04:33:29 +0000
commit389a31cde3d4b488b605ec1d6eda187001fb1fbe (patch)
tree04321703d269eabd918c1088533bb4327c5d1c2a
parente14478a19adaffac219b268b2e1bece3bde9572a (diff)
downloadkernel_samsung_smdk4412-389a31cde3d4b488b605ec1d6eda187001fb1fbe.zip
kernel_samsung_smdk4412-389a31cde3d4b488b605ec1d6eda187001fb1fbe.tar.gz
kernel_samsung_smdk4412-389a31cde3d4b488b605ec1d6eda187001fb1fbe.tar.bz2
sh: Fix FDPIC binary loader
commit 4a71997a3279a339e7336ea5d0cd27282e2dea44 upstream. 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> Signed-off-by: Paul Mundt <lethal@linux-sh.org> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-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 f38112b..978b7fd 100644
--- a/arch/sh/include/asm/elf.h
+++ b/arch/sh/include/asm/elf.h
@@ -202,9 +202,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