diff --git a/[refs] b/[refs]
index 0baaa4d5e452..a46700205f7a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b16c2a493fe1e439c4e7ad51f58153968ca6cf3
+refs/heads/master: 2a0010af17b1739ef8ea8cf02647a127241ee674
diff --git a/trunk/kernel/cpuset.c b/trunk/kernel/cpuset.c
index 93d140f159cc..9bd30b9c430c 100644
--- a/trunk/kernel/cpuset.c
+++ b/trunk/kernel/cpuset.c
@@ -789,13 +789,6 @@ static void rebuild_sched_domains_locked(void)
 static void rebuild_sched_domains_locked(void)
 {
 }
-
-static int generate_sched_domains(cpumask_var_t **domains,
-			struct sched_domain_attr **attributes)
-{
-	*domains = NULL;
-	return 1;
-}
 #endif /* CONFIG_SMP */
 
 void rebuild_sched_domains(void)