diff options
| author |  Helge Deller <deller@kernel.org>
| 2024-04-27 19:43:51 +0200 |
|---|---|---|
| committer |  Helge Deller <deller@gmx.de>
| 2024-04-29 13:02:31 +0200 |
| commit | 487fa28fa8b60417642ac58e8beda6e2509d18f9 (patch) | |
| tree | 7e1ae61341bf8cdb86a4fd78552b288dbe2cbd12 /arch/parisc | |
| parent | Linux 6.9-rc6 (diff) | |
| download | linux-487fa28fa8b60417642ac58e8beda6e2509d18f9.tar.gz linux-487fa28fa8b60417642ac58e8beda6e2509d18f9.tar.bz2 linux-487fa28fa8b60417642ac58e8beda6e2509d18f9.zip | |
parisc: Define sigset_t in parisc uapi header
The util-linux debian package fails to build on parisc, because
sigset_t isn't defined in asm/signal.h when included from userspace.
Move the sigset_t type from internal header to the uapi header to fix the
build.
Link: https://buildd.debian.org/status/fetch.php?pkg=util-linux&arch=hppa&ver=2.40-7&stamp=1714163443&raw=0
Signed-off-by: Helge Deller <deller@gmx.de>
Cc: stable@vger.kernel.org # v6.0+
Diffstat (limited to 'arch/parisc')
| -rw-r--r-- | arch/parisc/include/asm/signal.h | 12 | ||||
| -rw-r--r-- | arch/parisc/include/uapi/asm/signal.h | 10 |
2 files changed, 10 insertions, 12 deletions
diff --git a/arch/parisc/include/asm/signal.h b/arch/parisc/include/asm/signal.h index 715c96ba2ec8..e84883c6b4c7 100644 --- a/arch/parisc/include/asm/signal.h +++ b/arch/parisc/include/asm/signal.h @@ -4,23 +4,11 @@ #include <uapi/asm/signal.h> -#define _NSIG 64 -/* bits-per-word, where word apparently means 'long' not 'int' */ -#define _NSIG_BPW BITS_PER_LONG -#define _NSIG_WORDS (_NSIG / _NSIG_BPW) - # ifndef __ASSEMBLY__ /* Most things should be clean enough to redefine this at will, if care is taken to make libc match. */ -typedef unsigned long old_sigset_t; /* at least 32 bits */ - -typedef struct { - /* next_signal() assumes this is a long - no choice */ - unsigned long sig[_NSIG_WORDS]; -} sigset_t; - #include <asm/sigcontext.h> #endif /* !__ASSEMBLY */ diff --git a/arch/parisc/include/uapi/asm/signal.h b/arch/parisc/include/uapi/asm/signal.h index 8e4895c5ea5d..40d7a574c5dd 100644 --- a/arch/parisc/include/uapi/asm/signal.h +++ b/arch/parisc/include/uapi/asm/signal.h @@ -57,10 +57,20 @@ #include <asm-generic/signal-defs.h> +#define _NSIG 64 +#define _NSIG_BPW (sizeof(unsigned long) * 8) +#define _NSIG_WORDS (_NSIG / _NSIG_BPW) + # ifndef __ASSEMBLY__ # include <linux/types.h> +typedef unsigned long old_sigset_t; /* at least 32 bits */ + +typedef struct { + unsigned long sig[_NSIG_WORDS]; +} sigset_t; + /* Avoid too many header ordering problems. */ struct siginfo; |