| From d5ab780305bb6d60a7b5a74f18cf84eb6ad153b1 Mon Sep 17 00:00:00 2001 |
| From: Andrew Stubbs <ams@codesourcery.com> |
| Date: Mon, 29 Mar 2010 12:04:19 +0900 |
| Subject: sh: Fix FDPIC binary loader |
| |
| From: Andrew Stubbs <ams@codesourcery.com> |
| |
| commit d5ab780305bb6d60a7b5a74f18cf84eb6ad153b1 upstream. |
| |
| Ensure that the aux table is properly initialized, even when optional |
| features are missing. Without this, the FDPIC loader did not work. |
| |
| Signed-off-by: Andrew Stubbs <ams@codesourcery.com> |
| Signed-off-by: Paul Mundt <lethal@linux-sh.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| arch/sh/include/asm/elf.h | 6 ++++-- |
| 1 file changed, 4 insertions(+), 2 deletions(-) |
| |
| --- a/arch/sh/include/asm/elf.h |
| +++ b/arch/sh/include/asm/elf.h |
| @@ -212,7 +212,9 @@ extern void __kernel_vsyscall; |
| |
| #define VSYSCALL_AUX_ENT \ |
| if (vdso_enabled) \ |
| - NEW_AUX_ENT(AT_SYSINFO_EHDR, VDSO_BASE); |
| + NEW_AUX_ENT(AT_SYSINFO_EHDR, VDSO_BASE); \ |
| + else \ |
| + NEW_AUX_ENT(AT_IGNORE, 0); |
| #else |
| #define VSYSCALL_AUX_ENT |
| #endif /* CONFIG_VSYSCALL */ |
| @@ -220,7 +222,7 @@ extern void __kernel_vsyscall; |
| #ifdef CONFIG_SH_FPU |
| #define FPU_AUX_ENT NEW_AUX_ENT(AT_FPUCW, FPSCR_INIT) |
| #else |
| -#define FPU_AUX_ENT |
| +#define FPU_AUX_ENT NEW_AUX_ENT(AT_IGNORE, 0) |
| #endif |
| |
| extern int l1i_cache_shape, l1d_cache_shape, l2_cache_shape; |
