diff --git a/[refs] b/[refs]
index 6b5e608ddbf0..9f5d1038d2b8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b2b9c1af065a45ef00c26964420489a53581779
+refs/heads/master: 723edb5060855ef36ddeca51a070784b0e0d16df
diff --git a/trunk/include/asm-x86/signal.h b/trunk/include/asm-x86/signal.h
index f15186d39c69..6dac49364e95 100644
--- a/trunk/include/asm-x86/signal.h
+++ b/trunk/include/asm-x86/signal.h
@@ -181,12 +181,12 @@ typedef struct sigaltstack {
 #ifdef __KERNEL__
 #include <asm/sigcontext.h>
 
-#ifdef __386__
+#ifdef __i386__
 
 #define __HAVE_ARCH_SIG_BITOPS
 
 #define sigaddset(set,sig)		    \
-	(__builtin_constantp(sig)	    \
+	(__builtin_constant_p(sig)	    \
 	 ? __const_sigaddset((set), (sig))  \
 	 : __gen_sigaddset((set), (sig)))