Commit 7ee332c9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents ff2632d7 d4a59991

arch/parisc/include/asm/page.h

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#define PAGE_SIZE	(_AC(1,UL) << PAGE_SHIFT)

#define PAGE_MASK	(~(PAGE_SIZE-1))



#define HAVE_ARCH_HUGETLB_UNMAPPED_AREA



#ifndef __ASSEMBLY__

arch/parisc/include/asm/signal.h

+0 −12
Original line number Diff line number Diff line
@@ -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 */

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

+10 −0
Original line number Diff line number Diff line
@@ -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;

arch/parisc/math-emu/driver.c

+0 −6
Original line number Diff line number Diff line
@@ -26,12 +26,6 @@ 


#define FPUDEBUG 0



/* Format of the floating-point exception registers. */

struct exc_reg {

	unsigned int exception : 6;

	unsigned int ei : 26;

};



/* Macros for grabbing bits of the instruction format from the 'ei'

   field above. */

/* Major opcode 0c and 0e */