diff options
author | Randy Dunlap <randy.dunlap@oracle.com> | 2008-01-21 17:18:25 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-21 19:39:41 -0800 |
commit | 48ccf3dac341118992b70ca89c47728e8b1d300b (patch) | |
tree | 6a5c8ba87c5c2bb1e08aa73ca2fd2c2be5c17188 /kernel/timer.c | |
parent | 0ec160dd48b666ddef39d639323d0da26d0b710d (diff) | |
download | linux-stable-48ccf3dac341118992b70ca89c47728e8b1d300b.tar.gz linux-stable-48ccf3dac341118992b70ca89c47728e8b1d300b.tar.bz2 linux-stable-48ccf3dac341118992b70ca89c47728e8b1d300b.zip |
timer: fix section mismatch
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 <randy.dunlap@oracle.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@akpm@linux-foundation.org>
Diffstat (limited to 'kernel/timer.c')
-rw-r--r-- | kernel/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index 26671f4db07f..2a00c22203f3 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -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; |