diff options
author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2008-01-26 08:11:31 -0500 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2008-01-26 08:11:33 -0500 |
commit | 9d40d2e3955185b69c264583d080eb3defcb05a0 (patch) | |
tree | c2b573abaac3747b5a09846bcc887f7a6390a838 /arch/s390 | |
parent | 361f494d4e62ee5f7a971bf34945deeb69392159 (diff) |
[S390] replace lock_cpu_hotplug with get_online_cpus
Git commit 86ef5c9a8edd78e6bf92879f32329d89b2d55b5a 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>
Diffstat (limited to 'arch/s390')
-rw-r--r-- | arch/s390/kernel/smp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c index f66db7185d85..aa37fa154512 100644 --- a/arch/s390/kernel/smp.c +++ b/arch/s390/kernel/smp.c | |||
@@ -568,9 +568,9 @@ static void __init smp_detect_cpus(void) | |||
568 | out: | 568 | out: |
569 | kfree(info); | 569 | kfree(info); |
570 | printk(KERN_INFO "CPUs: %d configured, %d standby\n", c_cpus, s_cpus); | 570 | printk(KERN_INFO "CPUs: %d configured, %d standby\n", c_cpus, s_cpus); |
571 | lock_cpu_hotplug(); | 571 | get_online_cpus(); |
572 | smp_rescan_cpus(); | 572 | smp_rescan_cpus(); |
573 | unlock_cpu_hotplug(); | 573 | put_online_cpus(); |
574 | } | 574 | } |
575 | 575 | ||
576 | /* | 576 | /* |
@@ -872,7 +872,7 @@ static ssize_t cpu_configure_store(struct sys_device *dev, const char *buf, | |||
872 | return -EINVAL; | 872 | return -EINVAL; |
873 | 873 | ||
874 | mutex_lock(&smp_cpu_state_mutex); | 874 | mutex_lock(&smp_cpu_state_mutex); |
875 | lock_cpu_hotplug(); | 875 | get_online_cpus(); |
876 | rc = -EBUSY; | 876 | rc = -EBUSY; |
877 | if (cpu_online(cpu)) | 877 | if (cpu_online(cpu)) |
878 | goto out; | 878 | goto out; |
@@ -896,7 +896,7 @@ static ssize_t cpu_configure_store(struct sys_device *dev, const char *buf, | |||
896 | break; | 896 | break; |
897 | } | 897 | } |
898 | out: | 898 | out: |
899 | unlock_cpu_hotplug(); | 899 | put_online_cpus(); |
900 | mutex_unlock(&smp_cpu_state_mutex); | 900 | mutex_unlock(&smp_cpu_state_mutex); |
901 | return rc ? rc : count; | 901 | return rc ? rc : count; |
902 | } | 902 | } |
@@ -1044,7 +1044,7 @@ static ssize_t rescan_store(struct sys_device *dev, const char *buf, | |||
1044 | int rc; | 1044 | int rc; |
1045 | 1045 | ||
1046 | mutex_lock(&smp_cpu_state_mutex); | 1046 | mutex_lock(&smp_cpu_state_mutex); |
1047 | lock_cpu_hotplug(); | 1047 | get_online_cpus(); |
1048 | newcpus = cpu_present_map; | 1048 | newcpus = cpu_present_map; |
1049 | rc = smp_rescan_cpus(); | 1049 | rc = smp_rescan_cpus(); |
1050 | if (rc) | 1050 | if (rc) |
@@ -1057,7 +1057,7 @@ static ssize_t rescan_store(struct sys_device *dev, const char *buf, | |||
1057 | } | 1057 | } |
1058 | rc = 0; | 1058 | rc = 0; |
1059 | out: | 1059 | out: |
1060 | unlock_cpu_hotplug(); | 1060 | put_online_cpus(); |
1061 | mutex_unlock(&smp_cpu_state_mutex); | 1061 | mutex_unlock(&smp_cpu_state_mutex); |
1062 | return rc ? rc : count; | 1062 | return rc ? rc : count; |
1063 | } | 1063 | } |