cpuinit fixes in kernel/*

Signed-off-by: Al Viro <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
kyagi · Nov 30, 2008 · 8419641 · 8419641
1 parent b038514
commit 8419641
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/kernel/cpu.c b/kernel/cpu.c
@@ -462,7 +462,7 @@ void __ref enable_nonboot_cpus(void)
  * It must be called by the arch code on the new cpu, before the new cpu
  * enables interrupts and before the "boot" cpu returns from __cpu_up().
  */
-void notify_cpu_starting(unsigned int cpu)
+void __cpuinit notify_cpu_starting(unsigned int cpu)
 {
 	unsigned long val = CPU_STARTING;
 

diff --git a/kernel/profile.c b/kernel/profile.c
@@ -351,7 +351,7 @@ void profile_hits(int type, void *__pc, unsigned int nr_hits)
 	put_cpu();
 }
 
-static int __devinit profile_cpu_callback(struct notifier_block *info,
+static int __cpuinit profile_cpu_callback(struct notifier_block *info,
 					unsigned long action, void *__cpu)
 {
 	int node, cpu = (unsigned long)__cpu;
@@ -596,7 +596,7 @@ static int create_hash_tables(void)
 #define create_hash_tables()			({ 0; })
 #endif
 
-int create_proc_profile(void)
+int __ref create_proc_profile(void) /* false positive from hotcpu_notifier */
 {
 	struct proc_dir_entry *entry;