diff options
Diffstat (limited to 'arch/s390/kernel/topology.c')
-rw-r--r-- | arch/s390/kernel/topology.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/s390/kernel/topology.c b/arch/s390/kernel/topology.c index 83579ed62933..90e9ba11eba1 100644 --- a/arch/s390/kernel/topology.c +++ b/arch/s390/kernel/topology.c | |||
@@ -216,7 +216,7 @@ static void update_cpu_core_map(void) | |||
216 | cpu_core_map[cpu] = cpu_coregroup_map(cpu); | 216 | cpu_core_map[cpu] = cpu_coregroup_map(cpu); |
217 | } | 217 | } |
218 | 218 | ||
219 | void arch_update_cpu_topology(void) | 219 | int arch_update_cpu_topology(void) |
220 | { | 220 | { |
221 | struct tl_info *info = tl_info; | 221 | struct tl_info *info = tl_info; |
222 | struct sys_device *sysdev; | 222 | struct sys_device *sysdev; |
@@ -225,7 +225,7 @@ void arch_update_cpu_topology(void) | |||
225 | if (!machine_has_topology) { | 225 | if (!machine_has_topology) { |
226 | update_cpu_core_map(); | 226 | update_cpu_core_map(); |
227 | topology_update_polarization_simple(); | 227 | topology_update_polarization_simple(); |
228 | return; | 228 | return 0; |
229 | } | 229 | } |
230 | stsi(info, 15, 1, 2); | 230 | stsi(info, 15, 1, 2); |
231 | tl_to_cores(info); | 231 | tl_to_cores(info); |
@@ -234,6 +234,7 @@ void arch_update_cpu_topology(void) | |||
234 | sysdev = get_cpu_sysdev(cpu); | 234 | sysdev = get_cpu_sysdev(cpu); |
235 | kobject_uevent(&sysdev->kobj, KOBJ_CHANGE); | 235 | kobject_uevent(&sysdev->kobj, KOBJ_CHANGE); |
236 | } | 236 | } |
237 | return 1; | ||
237 | } | 238 | } |
238 | 239 | ||
239 | static void topology_work_fn(struct work_struct *work) | 240 | static void topology_work_fn(struct work_struct *work) |