diff options
| author | Thomas Schwinge | 2012-11-16 10:46:20 +0100 |
|---|---|---|
| committer | Paul Mundt | 2013-01-11 13:02:57 +0100 |
| commit | 4a71997a3279a339e7336ea5d0cd27282e2dea44 (patch) | |
| tree | 22fef4495a6a023726c621dccdfdc83cd5bc6d5c /arch | |
| parent | sh: clkfwk: bugfix: sh_clk_div_enable() care sh_clk_div_set_rate() if div6 (diff) | |
| download | kernel-qcow2-linux-4a71997a3279a339e7336ea5d0cd27282e2dea44.tar.gz kernel-qcow2-linux-4a71997a3279a339e7336ea5d0cd27282e2dea44.tar.xz kernel-qcow2-linux-4a71997a3279a339e7336ea5d0cd27282e2dea44.zip | |
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')
| -rw-r--r-- | arch/sh/include/asm/elf.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/include/asm/elf.h b/arch/sh/include/asm/elf.h index 37924afa8d8a..bf9f44f17c29 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 |