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

Commit 80fa8181 authored by Ralf Baechle's avatar Ralf Baechle
Browse files

MIPS: Delete definition of SA_RESTORER. 



SA_RESTORER used to be defined as 0x04000000 but only the O32 ABI ever
supported its use and no libc was using it, so the entire sa-restorer
functionality was removed with lmo commit 39bffc12c3580ab [Zap sa_restorer.]
for 2.5.48 retaining only the SA_RESTORER definition as a reminder to avoid
accidental reuse of the mask bit.

Upstream cdef9602fbf1871a43f0f1b5cea10dd0f275167d [signal: always clear
sa_restorer on execve] adds code that assumes sa_sigaction has an
sa_restorer field, if SA_RESTORER is defined which would break MIPS.
So remove the SA_RESTORER definition before the v3.8.4 merge.

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
(cherry picked from commit 17da8d63add23830892ac4dc2cbb3b5d4ffb79a8)
parent adb37892

arch/mips/include/uapi/asm/signal.h

+6 −2
Original line number Original line Diff line number Diff line
@@ -72,6 +72,12 @@ typedef unsigned long old_sigset_t; /* at least 32 bits */ 
 *

 *

 * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single

 * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single

 * Unix names RESETHAND and NODEFER respectively.

 * Unix names RESETHAND and NODEFER respectively.

 *

 * SA_RESTORER used to be defined as 0x04000000 but only the O32 ABI ever

 * supported its use and no libc was using it, so the entire sa-restorer

 * functionality was removed with lmo commit 39bffc12c3580ab for 2.5.48

 * retaining only the SA_RESTORER definition as a reminder to avoid

 * accidental reuse of the mask bit.

 */

 */

#define SA_ONSTACK	0x08000000

#define SA_ONSTACK	0x08000000

#define SA_RESETHAND	0x80000000

#define SA_RESETHAND	0x80000000
@@ -84,8 +90,6 @@ typedef unsigned long old_sigset_t; /* at least 32 bits */ 
#define SA_NOMASK	SA_NODEFER

#define SA_NOMASK	SA_NODEFER

#define SA_ONESHOT	SA_RESETHAND

#define SA_ONESHOT	SA_RESETHAND





#define SA_RESTORER	0x04000000	/* Only for o32 */



#define MINSIGSTKSZ    2048

#define MINSIGSTKSZ    2048

#define SIGSTKSZ       8192

#define SIGSTKSZ       8192