Commit 6febd8be authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'signal-for-v5.11' of...

Merge branch 'signal-for-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

Pull signal cleanup from Eric Biederman:
 "Remove a never used HP-UX compatibility from parisc headers and
  consolidating the SA_* flags definitions into a generic header as much
  as possible.

  We only have 32 SA_* flag bits total, so we need to be careful. But as
  this is the first addition in a decade or so I think we are fine for
  the forseeable future"

* 'signal-for-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
  signal/parisc: Remove parisc specific definition of __ARCH_UAPI_SA_FLAGS
parents 345d4ab5 bc54a5cd
Loading
Loading
Loading
Loading
+0 −2
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ typedef struct {
	unsigned long sig[_NSIG_WORDS];
} sigset_t;

#define __ARCH_UAPI_SA_FLAGS	_SA_SIGGFAULT

#include <asm/sigcontext.h>

#endif /* !__ASSEMBLY */