[PATCH] intel_rapl: Correct hotplug correction

[Borislav Petkov]

From: Borislav Petkov <bp@xxxxxxx>

So 009f225ef050 ("powercap, intel-rapl: Fix CPU hotplug callback
registration") says how get_/put_online_cpus() should be replaced with
this cpu_notifier_register_begin/_done().

But they're still there so what's up?

Let me do what was supposed to be done.

Cc: Srinivas Pandruvada <srinivas.pandruvada@xxxxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: Jacob Pan <jacob.jun.pan@xxxxxxxxxxxxxxx>
Cc: Srivatsa S. Bhat <srivatsa.bhat@xxxxxxxxxxxxxxxxxx>
Cc: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
Signed-off-by: Borislav Petkov <bp@xxxxxxx>
---
 drivers/powercap/intel_rapl.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/powercap/intel_rapl.c b/drivers/powercap/intel_rapl.c
index d9a0770b6c73..9055f3df1f64 100644
--- a/drivers/powercap/intel_rapl.c
+++ b/drivers/powercap/intel_rapl.c
@@ -1377,8 +1377,6 @@ static int __init rapl_init(void)
 
 	cpu_notifier_register_begin();
 
-	/* prevent CPU hotplug during detection */
-	get_online_cpus();
 	ret = rapl_detect_topology();
 	if (ret)
 		goto done;
@@ -1390,7 +1388,6 @@ static int __init rapl_init(void)
 	}
 	__register_hotcpu_notifier(&rapl_cpu_notifier);
 done:
-	put_online_cpus();
 	cpu_notifier_register_done();
 
 	return ret;
-- 
1.9.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/