diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-04-08 13:16:27 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-04-08 13:16:27 +0200 |
| commit | 48edb259863ffa1ab958ffe4eca39d7f1a02e0c0 (patch) | |
| tree | 85cce570dee49945280cc4d5233616e1e1537961 | |
| parent | 467a9e1633043810259a7f5368fbcc1e84746137 (diff) | |
| parent | 553f809e23f00976caea7a1ebdabaa58a6383e7d (diff) | |
| download | linux-48edb259863ffa1ab958ffe4eca39d7f1a02e0c0.tar.bz2 | |
Merge branch 'cpu-hotplug'
* cpu-hotplug:
arm, kvm: fix double lock on cpu_add_remove_lock
| -rw-r--r-- | virt/kvm/arm/arch_timer.c | 2 | ||||
| -rw-r--r-- | virt/kvm/arm/vgic.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c index 5081e809821f..22fa819a9b6a 100644 --- a/virt/kvm/arm/arch_timer.c +++ b/virt/kvm/arm/arch_timer.c @@ -277,7 +277,7 @@ int kvm_timer_hyp_init(void) host_vtimer_irq = ppi; - err = register_cpu_notifier(&kvm_timer_cpu_nb); + err = __register_cpu_notifier(&kvm_timer_cpu_nb); if (err) { kvm_err("Cannot register timer CPU notifier\n"); goto out_free; diff --git a/virt/kvm/arm/vgic.c b/virt/kvm/arm/vgic.c index 8ca405cd7c1a..47b29834a6b6 100644 --- a/virt/kvm/arm/vgic.c +++ b/virt/kvm/arm/vgic.c @@ -1496,7 +1496,7 @@ int kvm_vgic_hyp_init(void) goto out; } - ret = register_cpu_notifier(&vgic_cpu_nb); + ret = __register_cpu_notifier(&vgic_cpu_nb); if (ret) { kvm_err("Cannot register vgic CPU notifier\n"); goto out_free_irq; |