Merge remote-tracking branch 'devicetree/devicetree/next'

[karo-tx-linux.git] / include / linux / cpu.h

diff --git a/include/linux/cpu.h b/include/linux/cpu.h
index fbd25c3c2923aa091676448256e001400bf3c1af..03e235ad1bba31bf4ba7fe155d9d64566179866c 100644 (file)
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
@@ -188,19 +188,6 @@ extern void cpu_hotplug_enable(void);
 void clear_tasks_mm_cpumask(int cpu);
 int cpu_down(unsigned int cpu);
 
-#ifdef CONFIG_ARCH_CPU_PROBE_RELEASE
-extern void cpu_hotplug_driver_lock(void);
-extern void cpu_hotplug_driver_unlock(void);
-#else
-static inline void cpu_hotplug_driver_lock(void)
-{
-}
-
-static inline void cpu_hotplug_driver_unlock(void)
-{
-}
-#endif
-
 #else          /* CONFIG_HOTPLUG_CPU */
 
 static inline void cpu_hotplug_begin(void) {}