[PATCH] timer: fix section mismatch

[PATCH] timer: fix section mismatch

[Randy Dunlap]

From: Randy Dunlap <randy.dunlap@oracle.com>

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>
---
 kernel/timer.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- linux-2.6.24-rc8-git2.orig/kernel/timer.c
+++ linux-2.6.24-rc8-git2/kernel/timer.c
@@ -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;

Re: [PATCH] timer: fix section mismatch

[Sam Ravnborg]

On Sat, Jan 19, 2008 at 11:57:15AM -0800, Randy Dunlap wrote:
> From: Randy Dunlap <randy.dunlap@oracle.com>
> 
> 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>
Acked-by: Sam Ravnborg <sam@ravnborg.org>

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
> ---
>  kernel/timer.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> --- linux-2.6.24-rc8-git2.orig/kernel/timer.c
> +++ linux-2.6.24-rc8-git2/kernel/timer.c
> @@ -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 majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/