diff options
author | Gautham R Shenoy <ego@in.ibm.com> | 2008-01-25 15:08:02 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-25 15:08:02 -0500 |
commit | 86ef5c9a8edd78e6bf92879f32329d89b2d55b5a (patch) | |
tree | 7bf46885326a6fdbb0c3596855408e9a5634dd3a /drivers | |
parent | d221938c049f4845da13c8593132595a6b9222a8 (diff) |
cpu-hotplug: replace lock_cpu_hotplug() with get_online_cpus()
Replace all lock_cpu_hotplug/unlock_cpu_hotplug from the kernel and use
get_online_cpus and put_online_cpus instead as it highlights the
refcount semantics in these operations.
The new API guarantees protection against the cpu-hotplug operation, but
it doesn't guarantee serialized access to any of the local data
structures. Hence the changes needs to be reviewed.
In case of pseries_add_processor/pseries_remove_processor, use
cpu_maps_update_begin()/cpu_maps_update_done() as we're modifying the
cpu_present_map there.
Signed-off-by: Gautham R Shenoy <ego@in.ibm.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/lguest/x86/core.c | 8 | ||||
-rw-r--r-- | drivers/s390/char/sclp_config.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c index 482aec2a9631..96d0fd07c57d 100644 --- a/drivers/lguest/x86/core.c +++ b/drivers/lguest/x86/core.c | |||
@@ -459,7 +459,7 @@ void __init lguest_arch_host_init(void) | |||
459 | 459 | ||
460 | /* We don't need the complexity of CPUs coming and going while we're | 460 | /* We don't need the complexity of CPUs coming and going while we're |
461 | * doing this. */ | 461 | * doing this. */ |
462 | lock_cpu_hotplug(); | 462 | get_online_cpus(); |
463 | if (cpu_has_pge) { /* We have a broader idea of "global". */ | 463 | if (cpu_has_pge) { /* We have a broader idea of "global". */ |
464 | /* Remember that this was originally set (for cleanup). */ | 464 | /* Remember that this was originally set (for cleanup). */ |
465 | cpu_had_pge = 1; | 465 | cpu_had_pge = 1; |
@@ -469,20 +469,20 @@ void __init lguest_arch_host_init(void) | |||
469 | /* Turn off the feature in the global feature set. */ | 469 | /* Turn off the feature in the global feature set. */ |
470 | clear_bit(X86_FEATURE_PGE, boot_cpu_data.x86_capability); | 470 | clear_bit(X86_FEATURE_PGE, boot_cpu_data.x86_capability); |
471 | } | 471 | } |
472 | unlock_cpu_hotplug(); | 472 | put_online_cpus(); |
473 | }; | 473 | }; |
474 | /*:*/ | 474 | /*:*/ |
475 | 475 | ||
476 | void __exit lguest_arch_host_fini(void) | 476 | void __exit lguest_arch_host_fini(void) |
477 | { | 477 | { |
478 | /* If we had PGE before we started, turn it back on now. */ | 478 | /* If we had PGE before we started, turn it back on now. */ |
479 | lock_cpu_hotplug(); | 479 | get_online_cpus(); |
480 | if (cpu_had_pge) { | 480 | if (cpu_had_pge) { |
481 | set_bit(X86_FEATURE_PGE, boot_cpu_data.x86_capability); | 481 | set_bit(X86_FEATURE_PGE, boot_cpu_data.x86_capability); |
482 | /* adjust_pge's argument "1" means set PGE. */ | 482 | /* adjust_pge's argument "1" means set PGE. */ |
483 | on_each_cpu(adjust_pge, (void *)1, 0, 1); | 483 | on_each_cpu(adjust_pge, (void *)1, 0, 1); |
484 | } | 484 | } |
485 | unlock_cpu_hotplug(); | 485 | put_online_cpus(); |
486 | } | 486 | } |
487 | 487 | ||
488 | 488 | ||
diff --git a/drivers/s390/char/sclp_config.c b/drivers/s390/char/sclp_config.c index 5322e5e54a98..9dc77f14fa52 100644 --- a/drivers/s390/char/sclp_config.c +++ b/drivers/s390/char/sclp_config.c | |||
@@ -29,12 +29,12 @@ static void sclp_cpu_capability_notify(struct work_struct *work) | |||
29 | struct sys_device *sysdev; | 29 | struct sys_device *sysdev; |
30 | 30 | ||
31 | printk(KERN_WARNING TAG "cpu capability changed.\n"); | 31 | printk(KERN_WARNING TAG "cpu capability changed.\n"); |
32 | lock_cpu_hotplug(); | 32 | get_online_cpus(); |
33 | for_each_online_cpu(cpu) { | 33 | for_each_online_cpu(cpu) { |
34 | sysdev = get_cpu_sysdev(cpu); | 34 | sysdev = get_cpu_sysdev(cpu); |
35 | kobject_uevent(&sysdev->kobj, KOBJ_CHANGE); | 35 | kobject_uevent(&sysdev->kobj, KOBJ_CHANGE); |
36 | } | 36 | } |
37 | unlock_cpu_hotplug(); | 37 | put_online_cpus(); |
38 | } | 38 | } |
39 | 39 | ||
40 | static void sclp_conf_receiver_fn(struct evbuf_header *evbuf) | 40 | static void sclp_conf_receiver_fn(struct evbuf_header *evbuf) |