arm, kvm: fix double lock on cpu_add_remove_lock
authorMing Lei <tom.leiming@gmail.com>
Sun, 6 Apr 2014 17:36:08 +0000 (01:36 +0800)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 8 Apr 2014 11:15:54 +0000 (13:15 +0200)
commit553f809e23f00976caea7a1ebdabaa58a6383e7d
tree85cce570dee49945280cc4d5233616e1e1537961
parent467a9e1633043810259a7f5368fbcc1e84746137
arm, kvm: fix double lock on cpu_add_remove_lock

Commit 8146875de7d4 (arm, kvm: Fix CPU hotplug callback registration)
holds the lock before calling the two functions:

kvm_vgic_hyp_init()
kvm_timer_hyp_init()

and both the two functions are calling register_cpu_notifier()
to register cpu notifier, so cause double lock on cpu_add_remove_lock.

Considered that both two functions are only called inside
kvm_arch_init() with holding cpu_add_remove_lock, so simply use
__register_cpu_notifier() to fix the problem.

Fixes: 8146875de7d4 (arm, kvm: Fix CPU hotplug callback registration)
Signed-off-by: Ming Lei <tom.leiming@gmail.com>
Reviewed-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
virt/kvm/arm/arch_timer.c
virt/kvm/arm/vgic.c