diff --git a/[refs] b/[refs]
index ad69994a6792..48e2ba7c2b55 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f9b8404cf8f8456dfa83459510762b700dc00385
+refs/heads/master: 8eb94f80dd2da5977c35cd094f0802c1501a12cd
diff --git a/trunk/include/asm-generic/bug.h b/trunk/include/asm-generic/bug.h
index 845cb67ad8ea..8ceab7bcd8b4 100644
--- a/trunk/include/asm-generic/bug.h
+++ b/trunk/include/asm-generic/bug.h
@@ -51,4 +51,10 @@
 	__ret;						\
 })
 
+#ifdef CONFIG_SMP
+# define WARN_ON_SMP(x)			WARN_ON(x)
+#else
+# define WARN_ON_SMP(x)			do { } while (0)
+#endif
+
 #endif