From: Mark Brown <broonie@linaro.org>
Date: Wed, 21 May 2014 19:11:24 +0000 (+0100)
Subject: Revert "arm64, debug-monitors: Fix CPU hotplug callback registration"
X-Git-Tag: firefly_0821_release~3680^2~122^2~3^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=134680cd6d7e33c92e8df36f4931e422a3e30b62;p=firefly-linux-kernel-4.4.55.git

Revert "arm64, debug-monitors: Fix CPU hotplug callback registration"

This reverts commit b057e1d80f916922081c7c5bd2c08ff53ed9e4fc.
---

diff --git a/arch/arm64/kernel/debug-monitors.c b/arch/arm64/kernel/debug-monitors.c
index d202656d9ca1..eafcaed94284 100644
--- a/arch/arm64/kernel/debug-monitors.c
+++ b/arch/arm64/kernel/debug-monitors.c
@@ -157,16 +157,12 @@ static struct notifier_block __cpuinitdata os_lock_nb = {
 
 static int __cpuinit debug_monitors_init(void)
 {
-	cpu_notifier_register_begin();
-
 	/* Clear the OS lock. */
 	smp_call_function(clear_os_lock, NULL, 1);
 	clear_os_lock(NULL);
 
 	/* Register hotplug handler. */
-	__register_cpu_notifier(&os_lock_nb);
-
-	cpu_notifier_register_done();
+	register_cpu_notifier(&os_lock_nb);
 	return 0;
 }
 postcore_initcall(debug_monitors_init);