diff options
| author | Andrew Stubbs <ams@codesourcery.com> | 2010-03-29 12:04:19 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-04-26 07:47:46 -0700 |
| commit | be366f07087f374dcf5f038c187828697ddc7480 (patch) | |
| tree | b3c20d34c73284dda92d7b7efdf3b17bfcb0f5e7 /arch/sh | |
| parent | f7a475acff3f1eea581c1e3ea1e46163c3408070 (diff) | |
| download | kernel-crypto-be366f07087f374dcf5f038c187828697ddc7480.tar.gz kernel-crypto-be366f07087f374dcf5f038c187828697ddc7480.tar.xz kernel-crypto-be366f07087f374dcf5f038c187828697ddc7480.zip | |
sh: Fix FDPIC binary loader
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>
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/include/asm/elf.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/sh/include/asm/elf.h b/arch/sh/include/asm/elf.h index ac04255022b..ce830faeebb 100644 --- a/arch/sh/include/asm/elf.h +++ b/arch/sh/include/asm/elf.h @@ -211,7 +211,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 */ @@ -219,7 +221,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; |