timer: fix section mismatch
authorRandy Dunlap <[email protected]>
Tue, 22 Jan 2008 01:18:25 +0000 (17:18 -0800)
committerLinus Torvalds <[email protected]>
Tue, 22 Jan 2008 03:39:41 +0000 (19:39 -0800)
The caller is __cpuinit.
Also, this code block and its caller are inside #ifdef CONFIG_HOTPLUG_CPU
blocks, so this code should reflect that config symbol's usage.

WARNING: vmlinux.o(.text+0x4252f): Section mismatch: reference to .init.text: (between 'timer_cpu_notify' and 'msleep')

Signed-off-by: Randy Dunlap <[email protected]>
Cc: Sam Ravnborg <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <torvalds@[email protected]>
kernel/timer.c

index 26671f4db07f58aef440dbdf8e963e7bb17d8f5c..2a00c22203f30179296211bcacb7697f27c5e18c 100644 (file)
@@ -1289,7 +1289,7 @@ static void migrate_timer_list(tvec_base_t *new_base, struct list_head *head)
        }
 }
 
-static void __devinit migrate_timers(int cpu)
+static void __cpuinit migrate_timers(int cpu)
 {
        tvec_base_t *old_base;
        tvec_base_t *new_base;