diff --git a/[refs] b/[refs]
index 964bc80e7c99..1ce44afcd855 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 675a0813609f9097e323261b1cc4b9dc3f50d40b
+refs/heads/master: 2355188570790930718fb72444cddc2959039d9d
diff --git a/trunk/include/linux/cpumask.h b/trunk/include/linux/cpumask.h
index 85bd790c201e..7047f58306a7 100644
--- a/trunk/include/linux/cpumask.h
+++ b/trunk/include/linux/cpumask.h
@@ -218,8 +218,8 @@ int __first_cpu(const cpumask_t *srcp);
 int __next_cpu(int n, const cpumask_t *srcp);
 #define next_cpu(n, src) __next_cpu((n), &(src))
 #else
-#define first_cpu(src)		0
-#define next_cpu(n, src)	1
+#define first_cpu(src)		({ (void)(src); 0; })
+#define next_cpu(n, src)	({ (void)(src); 1; })
 #endif
 
 #define cpumask_of_cpu(cpu)						\