lkml.org 
[lkml]   [2009]   [Feb]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH] cpuhotplug: remove cpu_hotplug_init()

cpu_hotplug_init() is almost equal to a dummy function,
this patch remove it.

Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
---
include/linux/cpu.h | 5 -----
init/main.c | 1 -
kernel/cpu.c | 11 +++--------
3 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/include/linux/cpu.h b/include/linux/cpu.h
index c2747ac..7579807 100644
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
@@ -70,7 +70,6 @@ static inline void unregister_cpu_notifier(struct notifier_block *nb)

int cpu_up(unsigned int cpu);
void notify_cpu_starting(unsigned int cpu);
-extern void cpu_hotplug_init(void);
extern void cpu_maps_update_begin(void);
extern void cpu_maps_update_done(void);

@@ -85,10 +84,6 @@ static inline void unregister_cpu_notifier(struct notifier_block *nb)
{
}

-static inline void cpu_hotplug_init(void)
-{
-}
-
static inline void cpu_maps_update_begin(void)
{
}
diff --git a/init/main.c b/init/main.c
index 8442094..cf35e72 100644
--- a/init/main.c
+++ b/init/main.c
@@ -639,7 +639,6 @@ asmlinkage void __init start_kernel(void)
page_cgroup_init();
mem_init();
enable_debug_pagealloc();
- cpu_hotplug_init();
kmem_cache_init();
debug_objects_mem_init();
idr_init_cache();
diff --git a/kernel/cpu.c b/kernel/cpu.c
index 79e40f0..0c927ff 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -34,14 +34,9 @@ static struct {
* an ongoing cpu hotplug operation.
*/
int refcount;
-} cpu_hotplug;
-
-void __init cpu_hotplug_init(void)
-{
- cpu_hotplug.active_writer = NULL;
- mutex_init(&cpu_hotplug.lock);
- cpu_hotplug.refcount = 0;
-}
+} cpu_hotplug = {
+ .lock = __MUTEX_INITIALIZER(cpu_hotplug.lock),
+};

#ifdef CONFIG_HOTPLUG_CPU




\
 
 \ /
  Last update: 2009-02-18 12:23    [W:0.033 / U:21.704 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site