Hi Linus,
Every definition if sigmask() was the same. In one case it was
mutilply defined for the arm architecture. This patch removes all the
architecture defines of sigmask and moves the generic define from
the protection of __HAVE_ARCH_SIG_BITOPS.
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/diff -ruN 2.5.35/include/asm-arm/signal.h 2.5.35-si.1/include/asm-arm/signal.h --- 2.5.35/include/asm-arm/signal.h 2002-05-30 05:12:29.000000000 +1000 +++ 2.5.35-si.1/include/asm-arm/signal.h 2002-09-17 14:49:55.000000000 +1000 @@ -185,8 +185,6 @@ #ifdef __KERNEL__ #include <asm/sigcontext.h> -#define sigmask(sig) (1UL << ((sig) - 1)) - #define HAVE_ARCH_GET_SIGNAL_TO_DELIVER #endif diff -ruN 2.5.35/include/asm-i386/signal.h 2.5.35-si.1/include/asm-i386/signal.h --- 2.5.35/include/asm-i386/signal.h 2002-01-31 07:12:46.000000000 +1100 +++ 2.5.35-si.1/include/asm-i386/signal.h 2002-09-17 14:50:38.000000000 +1000 @@ -209,8 +209,6 @@ __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 -ruN 2.5.35/include/asm-m68k/signal.h 2.5.35-si.1/include/asm-m68k/signal.h --- 2.5.35/include/asm-m68k/signal.h 2002-05-30 05:12:29.000000000 +1000 +++ 2.5.35-si.1/include/asm-m68k/signal.h 2002-09-17 14:51:19.000000000 +1000 @@ -207,8 +207,6 @@ __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 -ruN 2.5.35/include/asm-sh/signal.h 2.5.35-si.1/include/asm-sh/signal.h --- 2.5.35/include/asm-sh/signal.h 1999-11-19 14:37:03.000000000 +1100 +++ 2.5.35-si.1/include/asm-sh/signal.h 2002-09-17 14:52:24.000000000 +1000 @@ -165,8 +165,6 @@ #ifdef __KERNEL__ #include <asm/sigcontext.h> -#define sigmask(sig) (1UL << ((sig) - 1)) - #endif /* __KERNEL__ */ #endif /* __ASM_SH_SIGNAL_H */ diff -ruN 2.5.35/include/asm-x86_64/signal.h 2.5.35-si.1/include/asm-x86_64/signal.h --- 2.5.35/include/asm-x86_64/signal.h 2002-06-17 13:12:30.000000000 +1000 +++ 2.5.35-si.1/include/asm-x86_64/signal.h 2002-09-17 14:53:50.000000000 +1000 @@ -195,8 +195,6 @@ __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 -ruN 2.5.35/include/linux/signal.h 2.5.35-si.1/include/linux/signal.h --- 2.5.35/include/linux/signal.h 2002-08-02 11:11:42.000000000 +1000 +++ 2.5.35-si.1/include/linux/signal.h 2002-09-17 14:53:23.000000000 +1000 @@ -60,10 +60,10 @@ 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> - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Mon Sep 23 2002 - 22:00:18 EST