diff --git a/[refs] b/[refs]
index fa72fbbfa78b..2026c46b886a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e68110fb54c3c784fb66be67d8d18a86286eefdd
+refs/heads/master: e0ad955680878998ff7dc51ce06ddad12260423a
diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h
index cbf2a3b46280..848d1f20086e 100644
--- a/trunk/include/linux/sched.h
+++ b/trunk/include/linux/sched.h
@@ -1817,10 +1817,13 @@ static inline int set_cpus_allowed_ptr(struct task_struct *p,
 	return 0;
 }
 #endif
+
+#ifndef CONFIG_CPUMASK_OFFSTACK
 static inline int set_cpus_allowed(struct task_struct *p, cpumask_t new_mask)
 {
 	return set_cpus_allowed_ptr(p, &new_mask);
 }
+#endif
 
 /*
  * Architectures can set this to 1 if they have specified