diff --git a/[refs] b/[refs]
index 25240c4bcb5c..c0e0a03b5899 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aedb0eb107961a234f7c38e53da65a8f7ea992a9
+refs/heads/master: faf6bbcf94caee10ba34adb86db4ecca96bfd3bf
diff --git a/trunk/include/linux/mempolicy.h b/trunk/include/linux/mempolicy.h
index 09f0f575ddff..daabb3aa1ec6 100644
--- a/trunk/include/linux/mempolicy.h
+++ b/trunk/include/linux/mempolicy.h
@@ -150,7 +150,7 @@ extern void mpol_rebind_mm(struct mm_struct *mm, nodemask_t *new);
 extern void mpol_fix_fork_child_flag(struct task_struct *p);
 #define set_cpuset_being_rebound(x) (cpuset_being_rebound = (x))
 
-#ifdef CONFIG_CPUSET
+#ifdef CONFIG_CPUSETS
 #define current_cpuset_is_being_rebound() \
 				(cpuset_being_rebound == current->cpuset)
 #else