Skip to contentSkip to conversation

timer: fix section mismatch

PATCH In review Randy Dunlap 2 participants 2 messages Jan 19, 2008

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 timer: fix section mismatch

From: Randy Dunlap <[email protected]>

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')

---
 kernel/timer.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/timer.c +1 -1
@@ -1289,7 +1289,7 @@ static void migrate_timer_list(tvec_base
 	}
 }
 
-static void __devinit migrate_timers(int cpu)
+static void __cpuinit migrate_timers(int cpu)
 {
 	tvec_base_t *old_base;
 	tvec_base_t *new_base;
Acked-by on v1 1/1
#1 lore raw
Quoted 9 lines · Randy Dunlap

From: Randy Dunlap <[email protected]>

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')

Andrew - another 2.6.24 candidate.

With
CONFIG_HOTPLUG=n
CONFIG_HOTPLUG_CPU=y

if the CPU_DEAD, CPU_DEAD_FROZEN happens then we will call migrate_timers which is _devinit and we just triggered a nice oops.

Sam

Quoted 20 lines
---
 kernel/timer.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/timer.c +1 -2
@@ -1289,7 +1289,7 @@ static void migrate_timer_list(tvec_base
 	}
 }
 
-static void __devinit migrate_timers(int cpu)
+static void __cpuinit migrate_timers(int cpu)
 {
 	tvec_base_t *old_base;
 	tvec_base_t *new_base;
--

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/