summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-12-15 19:14:27 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2020-12-15 19:14:27 -0800
commit6febd8bef36e64fc1f4aaff1f6302be5c653ad64 (patch)
tree78b4b4cce23afb05040a917af5cac5c5ea2e0ff0
parent345d4ab5e0a226e0e27219bef9ad150504666b0d (diff)
parentbc54a5cda97917155b8da0d99afe1dc0ed0b30db (diff)
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
-rw-r--r--arch/parisc/include/asm/signal.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/parisc/include/asm/signal.h b/arch/parisc/include/asm/signal.h
index 30dd1e43ef88..715c96ba2ec8 100644
--- a/arch/parisc/include/asm/signal.h
+++ b/arch/parisc/include/asm/signal.h
@@ -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 */