[PATCH] hrtimer: fix section mismatch

[PATCH] hrtimer: fix section mismatch

[Randy Dunlap]

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

Fix section mismatch in hrtimer.c:

WARNING: vmlinux.o(.text+0x50c61): Section mismatch: reference to .init.text: (between 'hrtimer_cpu_notify' and 'down_read_trylock')

Noticed by Johannes Berg and confirmed by Sam Ravnborg.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
 kernel/hrtimer.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- linux-2.6.24-rc8-git2.orig/kernel/hrtimer.c
+++ linux-2.6.24-rc8-git2/kernel/hrtimer.c
@@ -1378,7 +1378,7 @@ sys_nanosleep(struct timespec __user *rq
 /*
  * Functions related to boot-time initialization:
  */
-static void __devinit init_hrtimers_cpu(int cpu)
+static void __cpuinit init_hrtimers_cpu(int cpu)
 {
 	struct hrtimer_cpu_base *cpu_base = &per_cpu(hrtimer_bases, cpu);
 	int i;

Re: [PATCH] hrtimer: fix section mismatch

[Sam Ravnborg]

On Sat, Jan 19, 2008 at 11:57:10AM -0800, Randy Dunlap wrote:
> From: Randy Dunlap <randy.dunlap@oracle.com>
> 
> Fix section mismatch in hrtimer.c:
> 
> WARNING: vmlinux.o(.text+0x50c61): Section mismatch: reference to .init.text: (between 'hrtimer_cpu_notify' and 'down_read_trylock')
> 
> Noticed by Johannes Berg and confirmed by Sam Ravnborg.
> 
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>

> ---
>  kernel/hrtimer.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> --- linux-2.6.24-rc8-git2.orig/kernel/hrtimer.c
> +++ linux-2.6.24-rc8-git2/kernel/hrtimer.c
> @@ -1378,7 +1378,7 @@ sys_nanosleep(struct timespec __user *rq
>  /*
>   * Functions related to boot-time initialization:
>   */
> -static void __devinit init_hrtimers_cpu(int cpu)
> +static void __cpuinit init_hrtimers_cpu(int cpu)
>  {
>  	struct hrtimer_cpu_base *cpu_base = &per_cpu(hrtimer_bases, cpu);
>  	int i;
> --
> 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/

Re: [PATCH] hrtimer: fix section mismatch

[Sam Ravnborg]

On Sat, Jan 19, 2008 at 10:31:46PM +0100, Sam Ravnborg wrote:
> On Sat, Jan 19, 2008 at 11:57:10AM -0800, Randy Dunlap wrote:
> > From: Randy Dunlap <randy.dunlap@oracle.com>
> > 
> > Fix section mismatch in hrtimer.c:
> > 
> > WARNING: vmlinux.o(.text+0x50c61): Section mismatch: reference to .init.text: (between 'hrtimer_cpu_notify' and 'down_read_trylock')
> > 
> > Noticed by Johannes Berg and confirmed by Sam Ravnborg.
> > 
> > Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> Acked-by: Sam Ravnborg <sam@ravnborg.org>

And looking at bit closer this looks like a 2.6.24 candidate.
With:
CONFIG_HOTPLUG=n
CONFIG_HOTPLUG_CPU=y

then we may see a call to init_hrtimers_cpu() from hrtimer_cpu_notify()
in the:
      case CPU_UP_PREPARE:
      case CPU_UP_PREPARE_FROZEN:
cases.

And this will oops.

[It these a cases will be hit I dunno - I just follow the
logic of the code here.]

	Sam

> 
> > ---
> >  kernel/hrtimer.c |    2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > --- linux-2.6.24-rc8-git2.orig/kernel/hrtimer.c
> > +++ linux-2.6.24-rc8-git2/kernel/hrtimer.c
> > @@ -1378,7 +1378,7 @@ sys_nanosleep(struct timespec __user *rq
> >  /*
> >   * Functions related to boot-time initialization:
> >   */
> > -static void __devinit init_hrtimers_cpu(int cpu)
> > +static void __cpuinit init_hrtimers_cpu(int cpu)
> >  {
> >  	struct hrtimer_cpu_base *cpu_base = &per_cpu(hrtimer_bases, cpu);
> >  	int i;
> > --
> > 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/
> --
> 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/