aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-05-21 20:11:24 +0100
committerMark Brown <broonie@linaro.org>2014-05-21 20:11:24 +0100
commit134680cd6d7e33c92e8df36f4931e422a3e30b62 (patch)
tree703fdd496f4f34d09666ae54f5047cd6ce19ae0e
parent4b3a1128177031c2e5125b1bb4e5ac9af0a708c7 (diff)
downloadlinux-linaro-stable-v3.10/topic/arm64-kgdb.tar.gz
Revert "arm64, debug-monitors: Fix CPU hotplug callback registration"v3.10/topic/arm64-kgdb
This reverts commit b057e1d80f916922081c7c5bd2c08ff53ed9e4fc.
-rw-r--r--arch/arm64/kernel/debug-monitors.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm64/kernel/debug-monitors.c b/arch/arm64/kernel/debug-monitors.c
index d202656..eafcaed 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);