diff options
Diffstat (limited to 'drivers/lguest')
-rw-r--r-- | drivers/lguest/x86/core.c | 8 |
1 files changed, 4 insertions, 4 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 | ||