Skip to content

Commit

Permalink
Merge branch 'signal-for-v5.11' of git://git.kernel.org/pub/scm/linux…
Browse files Browse the repository at this point in the history
…/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
  • Loading branch information
Linus Torvalds committed Dec 16, 2020
2 parents 345d4ab + bc54a5c commit 6febd8b
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions arch/parisc/include/asm/signal.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit 6febd8b

Please sign in to comment.