From c1105e186a86b18b2966f42e098000fdb50c0fb5 Mon Sep 17 00:00:00 2001 From: Michael Bohan Date: Mon, 19 Dec 2011 14:57:04 -0800 Subject: [PATCH] Revert "cpu-hotplug: Add the function 'cpu_hotplug_inprogress'" This reverts commit 3d321a35703d041a11f25f7abc27cc6c1ef8cd13. Since sched domains are allocated dynamically now these changes are N/A for 3.0. Hence the revert. Change-Id: I0059a4384c871815c01455d4b6f5c8be582a5d73 Signed-off-by: Michael Bohan --- include/linux/cpu.h | 1 - kernel/cpu.c | 8 -------- 2 files changed, 9 deletions(-) diff --git a/include/linux/cpu.h b/include/linux/cpu.h index 8d0ca4575d3..97f1ca76b4a 100644 --- a/include/linux/cpu.h +++ b/include/linux/cpu.h @@ -134,7 +134,6 @@ extern struct sysdev_class cpu_sysdev_class; extern void get_online_cpus(void); extern void put_online_cpus(void); -extern bool cpu_hotplug_inprogress(void); #define hotcpu_notifier(fn, pri) cpu_notifier(fn, pri) #define register_hotcpu_notifier(nb) register_cpu_notifier(nb) #define unregister_hotcpu_notifier(nb) unregister_cpu_notifier(nb) diff --git a/kernel/cpu.c b/kernel/cpu.c index ad7eaf24d35..404770761a4 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -123,14 +123,6 @@ static void cpu_hotplug_done(void) mutex_unlock(&cpu_hotplug.lock); } -bool cpu_hotplug_inprogress(void) -{ - if (cpu_hotplug.active_writer) - return true; - - return false; -} - #else /* #if CONFIG_HOTPLUG_CPU */ static void cpu_hotplug_begin(void) {} static void cpu_hotplug_done(void) {}