diff --git a/[refs] b/[refs] index 8520246c5c0d..bb20642b3437 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a00f6310183e164ad2cfa5f4ec5d8c724ff0f799 +refs/heads/master: 6b3e5f44b56745daad8cd913ccc7bcd9a9ece5ea diff --git a/trunk/include/asm-mips/signal.h b/trunk/include/asm-mips/signal.h index 87a1dff95199..5fc3a599d014 100644 --- a/trunk/include/asm-mips/signal.h +++ b/trunk/include/asm-mips/signal.h @@ -111,14 +111,7 @@ typedef unsigned long old_sigset_t; /* at least 32 bits */ #define SIG_SETMASK32 256 /* Goodie from SGI for BSD compatibility: set only the low 32 bit of the sigset. */ -/* Type of a signal handler. */ -typedef void __signalfn_t(int); -typedef __signalfn_t __user *__sighandler_t; - -/* Fake signal functions */ -#define SIG_DFL ((__sighandler_t)0) /* default signal handling */ -#define SIG_IGN ((__sighandler_t)1) /* ignore signal */ -#define SIG_ERR ((__sighandler_t)-1) /* error return from signal */ +#include struct sigaction { unsigned int sa_flags;