Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

[~andy/linux] / arch / s390 / kernel / topology.c

diff --git a/arch/s390/kernel/topology.c b/arch/s390/kernel/topology.c
index 83579ed6293361ac733d4d523904797545b31225..90e9ba11eba1940db367d3b23a95187b4b371c70 100644 (file)
--- a/arch/s390/kernel/topology.c
+++ b/arch/s390/kernel/topology.c
@@ -216,7 +216,7 @@ static void update_cpu_core_map(void)
                cpu_core_map[cpu] = cpu_coregroup_map(cpu);
 }
 
-void arch_update_cpu_topology(void)
+int arch_update_cpu_topology(void)
 {
        struct tl_info *info = tl_info;
        struct sys_device *sysdev;
@@ -225,7 +225,7 @@ void arch_update_cpu_topology(void)
        if (!machine_has_topology) {
                update_cpu_core_map();
                topology_update_polarization_simple();
-               return;
+               return 0;
        }
        stsi(info, 15, 1, 2);
        tl_to_cores(info);
@@ -234,6 +234,7 @@ void arch_update_cpu_topology(void)
                sysdev = get_cpu_sysdev(cpu);
                kobject_uevent(&sysdev->kobj, KOBJ_CHANGE);
        }
+       return 1;
 }
 
 static void topology_work_fn(struct work_struct *work)