OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[S390] replace lock_cpu_hotplug with get_online_cpus 

Git commit 86ef5c9a8e forgot a few
lock_cpu_hotplug/unlock_cpu_hotplug pairs in arch/s390/kernel/smp.c

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Martin Schwidefsky 2008-01-26 14:11:31 +01:00
parent 361f494d4e
commit 9d40d2e395
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/s390/kernel/smp.c
View File

@ -568,9 +568,9 @@ static void __init smp_detect_cpus(void)
out:
kfree(info);
printk(KERN_INFO "CPUs: %d configured, %d standby\n", c_cpus, s_cpus);
lock_cpu_hotplug();
get_online_cpus();
smp_rescan_cpus();
unlock_cpu_hotplug();
put_online_cpus();
}
/*
@ -872,7 +872,7 @@ static ssize_t cpu_configure_store(struct sys_device *dev, const char *buf,
return -EINVAL;
mutex_lock(&smp_cpu_state_mutex);
lock_cpu_hotplug();
get_online_cpus();
rc = -EBUSY;
if (cpu_online(cpu))
goto out;
@ -896,7 +896,7 @@ static ssize_t cpu_configure_store(struct sys_device *dev, const char *buf,
break;
}
out:
unlock_cpu_hotplug();
put_online_cpus();
mutex_unlock(&smp_cpu_state_mutex);
return rc ? rc : count;
}
@ -1044,7 +1044,7 @@ static ssize_t rescan_store(struct sys_device *dev, const char *buf,
int rc;
mutex_lock(&smp_cpu_state_mutex);
lock_cpu_hotplug();
get_online_cpus();
newcpus = cpu_present_map;
rc = smp_rescan_cpus();
if (rc)
@ -1057,7 +1057,7 @@ static ssize_t rescan_store(struct sys_device *dev, const char *buf,
}
rc = 0;
out:
unlock_cpu_hotplug();
put_online_cpus();
mutex_unlock(&smp_cpu_state_mutex);
return rc ? rc : count;
}