[PATCH v10 1/7] parisc: start using signal-defs.h
Dave Martin
Dave.Martin at arm.com
Tue Sep 8 11:12:01 EDT 2020
On Fri, Aug 21, 2020 at 10:10:11PM -0700, Peter Collingbourne wrote:
> We currently include signal-defs.h on all architectures except parisc.
> Make parisc fall in line. This will make maintenance easier once the
> flag bits are moved here.
>
> Signed-off-by: Peter Collingbourne <pcc at google.com>
> ---
> View this change in Gerrit: https://linux-review.googlesource.com/q/If03a5135fb514fe96548fb74610e6c3586a04064
>
> arch/parisc/include/uapi/asm/signal.h | 9 +--------
> include/uapi/asm-generic/signal-defs.h | 6 ++++++
> 2 files changed, 7 insertions(+), 8 deletions(-)
>
> diff --git a/arch/parisc/include/uapi/asm/signal.h b/arch/parisc/include/uapi/asm/signal.h
> index d38563a394f2..92a1c7ea44b4 100644
> --- a/arch/parisc/include/uapi/asm/signal.h
> +++ b/arch/parisc/include/uapi/asm/signal.h
> @@ -69,14 +69,7 @@
> #define MINSIGSTKSZ 2048
> #define SIGSTKSZ 8192
>
> -
> -#define SIG_BLOCK 0 /* for blocking signals */
> -#define SIG_UNBLOCK 1 /* for unblocking signals */
> -#define SIG_SETMASK 2 /* for setting the signal mask */
> -
> -#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 <asm/signal-defs.h>
>
> # ifndef __ASSEMBLY__
>
> diff --git a/include/uapi/asm-generic/signal-defs.h b/include/uapi/asm-generic/signal-defs.h
> index e9304c95ceea..ecdf6312bfa5 100644
> --- a/include/uapi/asm-generic/signal-defs.h
> +++ b/include/uapi/asm-generic/signal-defs.h
> @@ -15,8 +15,14 @@
> #endif
>
> #ifndef __ASSEMBLY__
> +#ifndef __hppa__
> +/*
> + * These have a special definition on parisc, see:
> + * arch/parisc/include/uapi/asm/signal.h
> + */
> typedef void __signalfn_t(int);
> typedef __signalfn_t __user *__sighandler_t;
> +#endif
Could we do something like
#ifndef __sighandler_t
/* ... */
#define __sighandler_t __sighandler_t
#endif
Then we don't have to have anything parisc-specific in the common
header, and arches can override this definition independently.
Not a big deal either way, though, and best to keep the comment about
why this is here in any case.
Cheers
---Dave
More information about the linux-arm-kernel
mailing list