From d127fed07f1d9df7463d089f9ca9b2762cffc54d Mon Sep 17 00:00:00 2001
From: Constantine Gavrilov <constg@qlusters.com>
Date: Thu, 17 Nov 2005 11:40:43 +0200
Subject: [PATCH] --- yaml --- r: 14280 b: refs/heads/master c:
 b7fd1edd2c0c225afa96af92d4adecb91e7d439d h: refs/heads/master v: v3

---
 [refs]                          |  2 +-
 trunk/include/asm-i386/signal.h | 31 +++++++++++++++++++++++++++----
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 736a38f5c963..6a9a2dd21f5a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b26b1100e26811e54770abaa221eae140ba840d
+refs/heads/master: b7fd1edd2c0c225afa96af92d4adecb91e7d439d
diff --git a/trunk/include/asm-i386/signal.h b/trunk/include/asm-i386/signal.h
index cbb47d34aa31..6ba29f145bf8 100644
--- a/trunk/include/asm-i386/signal.h
+++ b/trunk/include/asm-i386/signal.h
@@ -159,14 +159,37 @@ typedef struct sigaltstack {
 
 #define __HAVE_ARCH_SIG_BITOPS
 
-static __inline__ void sigaddset(sigset_t *set, int _sig)
+#define sigaddset(set,sig)                 \
+	(__builtin_constant_p(sig) ?       \
+	__const_sigaddset((set),(sig)) :   \
+	__gen_sigaddset((set),(sig)))
+
+static __inline__ void __gen_sigaddset(sigset_t *set, int _sig)
 {
-	__asm__("btsl %1,%0" : "=m"(*set) : "Ir"(_sig - 1) : "cc");
+	__asm__("btsl %1,%0" : "+m"(*set) : "Ir"(_sig - 1) : "cc");
 }
 
-static __inline__ void sigdelset(sigset_t *set, int _sig)
+static __inline__ void __const_sigaddset(sigset_t *set, int _sig)
 {
-	__asm__("btrl %1,%0" : "=m"(*set) : "Ir"(_sig - 1) : "cc");
+	unsigned long sig = _sig - 1;
+	set->sig[sig / _NSIG_BPW] |= 1 << (sig % _NSIG_BPW);
+}
+
+#define sigdelset(set,sig)                 \
+	(__builtin_constant_p(sig) ?       \
+	__const_sigdelset((set),(sig)) :   \
+	__gen_sigdelset((set),(sig)))
+
+
+static __inline__ void __gen_sigdelset(sigset_t *set, int _sig)
+{
+	__asm__("btrl %1,%0" : "+m"(*set) : "Ir"(_sig - 1) : "cc");
+}
+
+static __inline__ void __const_sigaddset(sigset_t *set, int _sig)
+{
+	unsigned long sig = _sig - 1;
+	set->sig[sig / _NSIG_BPW] &= ~(1 << (sig % _NSIG_BPW));
 }
 
 static __inline__ int __const_sigismember(sigset_t *set, int _sig)