renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-25 05:34:00 +08:00
Code

Merge branch 'cpu-hotplug'

Browse Source 
* cpu-hotplug:
  arm, kvm: fix double lock on cpu_add_remove_lock
This commit is contained in:
Rafael J. Wysocki 2014-04-08 13:16:27 +02:00
commit 48edb25986
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
virt/kvm/arm/arch_timer.c
View File

@ -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;

2
virt/kvm/arm/vgic.c
View File

@ -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;