Commit d5ab7803 authored by Andrew Stubbs's avatar Andrew Stubbs Committed by Paul Mundt

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.
Signed-off-by: default avatarAndrew Stubbs <ams@codesourcery.com>
Cc: stable@kernel.org
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 59a2f7d9
...@@ -211,7 +211,9 @@ extern void __kernel_vsyscall; ...@@ -211,7 +211,9 @@ extern void __kernel_vsyscall;
#define VSYSCALL_AUX_ENT \ #define VSYSCALL_AUX_ENT \
if (vdso_enabled) \ 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 #else
#define VSYSCALL_AUX_ENT #define VSYSCALL_AUX_ENT
#endif /* CONFIG_VSYSCALL */ #endif /* CONFIG_VSYSCALL */
...@@ -219,7 +221,7 @@ extern void __kernel_vsyscall; ...@@ -219,7 +221,7 @@ extern void __kernel_vsyscall;
#ifdef CONFIG_SH_FPU #ifdef CONFIG_SH_FPU
#define FPU_AUX_ENT NEW_AUX_ENT(AT_FPUCW, FPSCR_INIT) #define FPU_AUX_ENT NEW_AUX_ENT(AT_FPUCW, FPSCR_INIT)
#else #else
#define FPU_AUX_ENT #define FPU_AUX_ENT NEW_AUX_ENT(AT_IGNORE, 0)
#endif #endif
extern int l1i_cache_shape, l1d_cache_shape, l2_cache_shape; extern int l1i_cache_shape, l1d_cache_shape, l2_cache_shape;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment