diff options
Diffstat (limited to 'kernel/softlockup.c')
-rw-r--r-- | kernel/softlockup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/softlockup.c b/kernel/softlockup.c index 1ab790c67b17..492f0c72fec5 100644 --- a/kernel/softlockup.c +++ b/kernel/softlockup.c | |||
@@ -303,7 +303,7 @@ cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu) | |||
303 | break; | 303 | break; |
304 | case CPU_ONLINE: | 304 | case CPU_ONLINE: |
305 | case CPU_ONLINE_FROZEN: | 305 | case CPU_ONLINE_FROZEN: |
306 | check_cpu = any_online_cpu(cpu_online_map); | 306 | check_cpu = cpumask_any(cpu_online_mask); |
307 | wake_up_process(per_cpu(watchdog_task, hotcpu)); | 307 | wake_up_process(per_cpu(watchdog_task, hotcpu)); |
308 | break; | 308 | break; |
309 | #ifdef CONFIG_HOTPLUG_CPU | 309 | #ifdef CONFIG_HOTPLUG_CPU |
@@ -313,7 +313,7 @@ cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu) | |||
313 | cpumask_t temp_cpu_online_map = cpu_online_map; | 313 | cpumask_t temp_cpu_online_map = cpu_online_map; |
314 | 314 | ||
315 | cpu_clear(hotcpu, temp_cpu_online_map); | 315 | cpu_clear(hotcpu, temp_cpu_online_map); |
316 | check_cpu = any_online_cpu(temp_cpu_online_map); | 316 | check_cpu = cpumask_any(&temp_cpu_online_map); |
317 | } | 317 | } |
318 | break; | 318 | break; |
319 | 319 | ||
@@ -323,7 +323,7 @@ cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu) | |||
323 | break; | 323 | break; |
324 | /* Unbind so it can run. Fall thru. */ | 324 | /* Unbind so it can run. Fall thru. */ |
325 | kthread_bind(per_cpu(watchdog_task, hotcpu), | 325 | kthread_bind(per_cpu(watchdog_task, hotcpu), |
326 | any_online_cpu(cpu_online_map)); | 326 | cpumask_any(cpu_online_mask)); |
327 | case CPU_DEAD: | 327 | case CPU_DEAD: |
328 | case CPU_DEAD_FROZEN: | 328 | case CPU_DEAD_FROZEN: |
329 | p = per_cpu(watchdog_task, hotcpu); | 329 | p = per_cpu(watchdog_task, hotcpu); |