Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48edb259 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'cpu-hotplug' 

* cpu-hotplug:
  arm, kvm: fix double lock on cpu_add_remove_lock
parents 467a9e16 553f809e

virt/kvm/arm/arch_timer.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

virt/kvm/arm/vgic.c

+1 −1
Original line number Diff line number Diff line
@@ -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;