Skip to content

Commit 7ee332c

Browse files
committed
Merge tag 'parisc-for-6.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc updates from Helge Deller: - define sigset_t in parisc uapi header to fix build of util-linux - define HAVE_ARCH_HUGETLB_UNMAPPED_AREA to avoid compiler warning - drop unused 'exc_reg' struct in math-emu code * tag 'parisc-for-6.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux: parisc: Define HAVE_ARCH_HUGETLB_UNMAPPED_AREA parisc/math-emu: Remove unused struct 'exc_reg' parisc: Define sigset_t in parisc uapi header
2 parents ff2632d + d4a5999 commit 7ee332c

File tree

4 files changed

+11
-18
lines changed

4 files changed

+11
-18
lines changed

arch/parisc/include/asm/page.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#define PAGE_SIZE (_AC(1,UL) << PAGE_SHIFT)
99
#define PAGE_MASK (~(PAGE_SIZE-1))
1010

11+
#define HAVE_ARCH_HUGETLB_UNMAPPED_AREA
1112

1213
#ifndef __ASSEMBLY__
1314

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

arch/parisc/math-emu/driver.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,6 @@
2626

2727
#define FPUDEBUG 0
2828

29-
/* Format of the floating-point exception registers. */
30-
struct exc_reg {
31-
unsigned int exception : 6;
32-
unsigned int ei : 26;
33-
};
34-
3529
/* Macros for grabbing bits of the instruction format from the 'ei'
3630
field above. */
3731
/* Major opcode 0c and 0e */

0 commit comments

Comments
 (0)