Skip to content

Commit 487fa28

Browse files
committed
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+
1 parent e67572c commit 487fa28

File tree

2 files changed

+10
-12
lines changed

2 files changed

+10
-12
lines changed

arch/parisc/include/asm/signal.h

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,11 @@
44

55
#include <uapi/asm/signal.h>
66

7-
#define _NSIG 64
8-
/* bits-per-word, where word apparently means 'long' not 'int' */
9-
#define _NSIG_BPW BITS_PER_LONG
10-
#define _NSIG_WORDS (_NSIG / _NSIG_BPW)
11-
127
# ifndef __ASSEMBLY__
138

149
/* Most things should be clean enough to redefine this at will, if care
1510
is taken to make libc match. */
1611

17-
typedef unsigned long old_sigset_t; /* at least 32 bits */
18-
19-
typedef struct {
20-
/* next_signal() assumes this is a long - no choice */
21-
unsigned long sig[_NSIG_WORDS];
22-
} sigset_t;
23-
2412
#include <asm/sigcontext.h>
2513

2614
#endif /* !__ASSEMBLY */

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,20 @@
5757

5858
#include <asm-generic/signal-defs.h>
5959

60+
#define _NSIG 64
61+
#define _NSIG_BPW (sizeof(unsigned long) * 8)
62+
#define _NSIG_WORDS (_NSIG / _NSIG_BPW)
63+
6064
# ifndef __ASSEMBLY__
6165

6266
# include <linux/types.h>
6367

68+
typedef unsigned long old_sigset_t; /* at least 32 bits */
69+
70+
typedef struct {
71+
unsigned long sig[_NSIG_WORDS];
72+
} sigset_t;
73+
6474
/* Avoid too many header ordering problems. */
6575
struct siginfo;
6676

0 commit comments

Comments
 (0)