From: Ming Lei Date: Sun, 6 Apr 2014 17:36:08 +0000 (+0800) Subject: arm, kvm: fix double lock on cpu_add_remove_lock X-Git-Tag: v3.15-rc1~28^2~5^2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=553f809e23f00976caea7a1ebdabaa58a6383e7d;p=pandora-kernel.git 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 Reviewed-by: Srivatsa S. Bhat Signed-off-by: Rafael J. Wysocki --- Reading git-diff-tree failed