[MIPS] signal: Move sigframe definition for native O32/N64 into signal.c (66680583) · Commits · e / devices / android_kernel_samsung_universal8895

arch/mips/kernel/signal-common.h

+0 −26

Original line number	Diff line number	Diff line
		@@ -19,32 +19,6 @@
		# define DEBUGP(fmt, args...)
		#endif

		/*
		* Horribly complicated - with the bloody RM9000 workarounds enabled
		* the signal trampolines is moving to the end of the structure so we can
		* increase the alignment without breaking software compatibility.
		*/
		#if ICACHE_REFILLS_WORKAROUND_WAR == 0

		struct sigframe {
		u32 sf_ass[4]; /* argument save space for o32 */
		u32 sf_code[2]; /* signal trampoline */
		struct sigcontext sf_sc;
		sigset_t sf_mask;
		};

		#else /* ICACHE_REFILLS_WORKAROUND_WAR */

		struct sigframe {
		u32 sf_ass[4]; /* argument save space for o32 */
		u32 sf_pad[2];
		struct sigcontext sf_sc; /* hw context */
		sigset_t sf_mask;
		u32 sf_code[8] ____cacheline_aligned; /* signal trampoline */
		};

		#endif /* !ICACHE_REFILLS_WORKAROUND_WAR */

		/*
		* Determine which stack to use..
		*/

+20 −0

Original line number	Diff line number	Diff line
		@@ -36,8 +36,20 @@

		#define _BLOCKABLE (~(sigmask(SIGKILL) \| sigmask(SIGSTOP)))

		/*
		* Horribly complicated - with the bloody RM9000 workarounds enabled
		* the signal trampolines is moving to the end of the structure so we can
		* increase the alignment without breaking software compatibility.
		*/
		#if ICACHE_REFILLS_WORKAROUND_WAR == 0

		struct sigframe {
		u32 sf_ass[4]; /* argument save space for o32 */
		u32 sf_code[2]; /* signal trampoline */
		struct sigcontext sf_sc;
		sigset_t sf_mask;
		};

		struct rt_sigframe {
		u32 rs_ass[4]; /* argument save space for o32 */
		u32 rs_code[2]; /* signal trampoline */
		@@ -47,6 +59,14 @@ struct rt_sigframe {

		#else

		struct sigframe {
		u32 sf_ass[4]; /* argument save space for o32 */
		u32 sf_pad[2];
		struct sigcontext sf_sc; /* hw context */
		sigset_t sf_mask;
		u32 sf_code[8] ____cacheline_aligned; /* signal trampoline */
		};

		struct rt_sigframe {
		u32 rs_ass[4]; /* argument save space for o32 */
		u32 rs_pad[2];