| From 4a71997a3279a339e7336ea5d0cd27282e2dea44 Mon Sep 17 00:00:00 2001 |
| From: Thomas Schwinge <thomas@codesourcery.com> |
| Date: Fri, 16 Nov 2012 10:46:20 +0100 |
| Subject: sh: Fix FDPIC binary loader |
| |
| From: Thomas Schwinge <thomas@codesourcery.com> |
| |
| 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/sh/include/asm/elf.h | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- 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 |
