summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/asm-arm/signal.h2
-rw-r--r--include/asm-i386/signal.h2
-rw-r--r--include/asm-m68k/signal.h2
-rw-r--r--include/asm-sh/signal.h2
-rw-r--r--include/asm-x86_64/signal.h2
-rw-r--r--include/linux/signal.h4
6 files changed, 2 insertions, 12 deletions
diff --git a/include/asm-arm/signal.h b/include/asm-arm/signal.h
index dc745fcabe5c..ab3449d8b181 100644
--- a/include/asm-arm/signal.h
+++ b/include/asm-arm/signal.h
@@ -185,8 +185,6 @@ typedef struct sigaltstack {
#ifdef __KERNEL__
#include <asm/sigcontext.h>
-#define sigmask(sig) (1UL << ((sig) - 1))
-
#define HAVE_ARCH_GET_SIGNAL_TO_DELIVER
#endif
diff --git a/include/asm-i386/signal.h b/include/asm-i386/signal.h
index 499ba6d5ef7b..68d89be28620 100644
--- a/include/asm-i386/signal.h
+++ b/include/asm-i386/signal.h
@@ -209,8 +209,6 @@ static __inline__ int __gen_sigismember(sigset_t *set, int _sig)
__const_sigismember((set),(sig)) : \
__gen_sigismember((set),(sig)))
-#define sigmask(sig) (1UL << ((sig) - 1))
-
static __inline__ int sigfindinword(unsigned long word)
{
__asm__("bsfl %1,%0" : "=r"(word) : "rm"(word) : "cc");
diff --git a/include/asm-m68k/signal.h b/include/asm-m68k/signal.h
index c777dcfc6b25..06246d0994db 100644
--- a/include/asm-m68k/signal.h
+++ b/include/asm-m68k/signal.h
@@ -207,8 +207,6 @@ extern __inline__ int __gen_sigismember(sigset_t *set, int _sig)
__const_sigismember(set,sig) : \
__gen_sigismember(set,sig))
-#define sigmask(sig) (1UL << ((sig) - 1))
-
extern __inline__ int sigfindinword(unsigned long word)
{
__asm__("bfffo %1{#0,#0},%0" : "=d"(word) : "d"(word & -word) : "cc");
diff --git a/include/asm-sh/signal.h b/include/asm-sh/signal.h
index 0a6ebb3baae9..07f7fb474850 100644
--- a/include/asm-sh/signal.h
+++ b/include/asm-sh/signal.h
@@ -165,8 +165,6 @@ typedef struct sigaltstack {
#ifdef __KERNEL__
#include <asm/sigcontext.h>
-#define sigmask(sig) (1UL << ((sig) - 1))
-
#endif /* __KERNEL__ */
#endif /* __ASM_SH_SIGNAL_H */
diff --git a/include/asm-x86_64/signal.h b/include/asm-x86_64/signal.h
index 8716753b645c..65ff89b11075 100644
--- a/include/asm-x86_64/signal.h
+++ b/include/asm-x86_64/signal.h
@@ -193,8 +193,6 @@ extern __inline__ int __gen_sigismember(sigset_t *set, int _sig)
__const_sigismember((set),(sig)) : \
__gen_sigismember((set),(sig)))
-#define sigmask(sig) (1UL << ((sig) - 1))
-
extern __inline__ int sigfindinword(unsigned long word)
{
__asm__("bsfq %1,%0" : "=r"(word) : "rm"(word) : "cc");
diff --git a/include/linux/signal.h b/include/linux/signal.h
index 4209f934d03f..c00516609f3f 100644
--- a/include/linux/signal.h
+++ b/include/linux/signal.h
@@ -60,10 +60,10 @@ static inline int sigfindinword(unsigned long word)
return ffz(~word);
}
-#define sigmask(sig) (1UL << ((sig) - 1))
-
#endif /* __HAVE_ARCH_SIG_BITOPS */
+#define sigmask(sig) (1UL << ((sig) - 1))
+
#ifndef __HAVE_ARCH_SIG_SETOPS
#include <linux/string.h>