From ab20eea17d37d5d85739e26c6bf21784a7a7ff5b Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Thu, 25 Dec 2008 13:37:59 +0100
Subject: [PATCH] --- yaml --- r: 121355 b: refs/heads/master c:
 f414f5f15376764d68a31dc568d9e814d3fcb58a h: refs/heads/master i:   121353:
 a8744a7059276424a3b5385068698d3973dfaa85   121351:
 156152ed07c22b210ba9aaf53229ac07b99f374a v: v3

---
 [refs]                            | 2 +-
 trunk/arch/s390/kernel/topology.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8bd41ba9dd3e..ea3ebe234a77 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f2961c39eacd5d450048d8a3e91675486f3a015
+refs/heads/master: f414f5f15376764d68a31dc568d9e814d3fcb58a
diff --git a/trunk/arch/s390/kernel/topology.c b/trunk/arch/s390/kernel/topology.c
index 586c5e33b3f4..36faac50e774 100644
--- a/trunk/arch/s390/kernel/topology.c
+++ b/trunk/arch/s390/kernel/topology.c
@@ -12,6 +12,7 @@
 #include <linux/workqueue.h>
 #include <linux/cpu.h>
 #include <linux/smp.h>
+#include <linux/cpuset.h>
 #include <asm/delay.h>
 #include <asm/s390_ext.h>
 #include <asm/sysinfo.h>
@@ -234,7 +235,7 @@ void arch_update_cpu_topology(void)
 
 static void topology_work_fn(struct work_struct *work)
 {
-	arch_reinit_sched_domains();
+	rebuild_sched_domains();
 }
 
 void topology_schedule_update(void)