Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/sh/include/asm/elf.h

+4 −2
Original line number Diff line number Diff line
@@ -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;