[PATCH 2/7] console: fix section mismatch warning in vgacon.c

[PATCH 2/7] console: fix section mismatch warning in vgacon.c

[Sam Ravnborg]

Fix following section mismatch warning:
WARNING: vmlinux.o(.text+0x121e62): Section mismatch: reference to .init.text:__alloc_bootmem (between 'vgacon_startup' and 'vgacon_scrolldelta')

Browsing the code it seems that vgacon_scrollback_startup() is only
called during the init phase so the reference to the .init.text
section is OK.
Teach modpost not to warn using ___init_refok.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---
 drivers/video/console/vgacon.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c
index f46fe95..d18b73a 100644
--- a/drivers/video/console/vgacon.c
+++ b/drivers/video/console/vgacon.c
@@ -187,7 +187,11 @@ static void vgacon_scrollback_init(int pitch)
 	}
 }
 
-static void vgacon_scrollback_startup(void)
+/*
+ * Called only duing init so call of alloc_bootmen is ok.
+ * Marked __init_refok to silence modpost.
+ */
+static void __init_refok vgacon_scrollback_startup(void)
 {
 	vgacon_scrollback = alloc_bootmem(CONFIG_VGACON_SOFT_SCROLLBACK_SIZE
 					  * 1024);
-- 
1.5.1.rc3.g84b7-dirty

Re: [PATCH 2/7] console: fix section mismatch warning in vgacon.c

[Antonino A. Daplas]

On Fri, 2007-07-20 at 23:27 +0200, Sam Ravnborg wrote:
> Fix following section mismatch warning:
> WARNING: vmlinux.o(.text+0x121e62): Section mismatch: reference to .init.text:__alloc_bootmem (between 'vgacon_startup' and 'vgacon_scrolldelta')
> 
> Browsing the code it seems that vgacon_scrollback_startup() is only
> called during the init phase so the reference to the .init.text
> section is OK.
> Teach modpost not to warn using ___init_refok.
> 
> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Antonino Daplas <adaplas@gmail.com>

Tony

Re: [PATCH 2/7] console: fix section mismatch warning in vgacon.c

[Sam Ravnborg]

On Sat, Jul 21, 2007 at 07:37:29AM +0800, Antonino A. Daplas wrote:
> On Fri, 2007-07-20 at 23:27 +0200, Sam Ravnborg wrote:
> > Fix following section mismatch warning:
> > WARNING: vmlinux.o(.text+0x121e62): Section mismatch: reference to .init.text:__alloc_bootmem (between 'vgacon_startup' and 'vgacon_scrolldelta')
> > 
> > Browsing the code it seems that vgacon_scrollback_startup() is only
> > called during the init phase so the reference to the .init.text
> > section is OK.
> > Teach modpost not to warn using ___init_refok.
> > 
> > Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
> Acked-by: Antonino Daplas <adaplas@gmail.com>

Thanks. Will you take care of forwarding it it or do we rely
on Andrew in this area?

	Sam

Re: [PATCH 2/7] console: fix section mismatch warning in vgacon.c

[Andrew Morton]

On Sat, 21 Jul 2007 07:43:59 +0200 Sam Ravnborg <sam@ravnborg.org> wrote:

> On Sat, Jul 21, 2007 at 07:37:29AM +0800, Antonino A. Daplas wrote:
> > On Fri, 2007-07-20 at 23:27 +0200, Sam Ravnborg wrote:
> > > Fix following section mismatch warning:
> > > WARNING: vmlinux.o(.text+0x121e62): Section mismatch: reference to .init.text:__alloc_bootmem (between 'vgacon_startup' and 'vgacon_scrolldelta')
> > > 
> > > Browsing the code it seems that vgacon_scrollback_startup() is only
> > > called during the init phase so the reference to the .init.text
> > > section is OK.
> > > Teach modpost not to warn using ___init_refok.
> > > 
> > > Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
> > Acked-by: Antonino Daplas <adaplas@gmail.com>
> 
> Thanks. Will you take care of forwarding it it or do we rely
> on Andrew in this area?
> 

I tossed it into the next batch for Linus.  Tomorrow, I guess.

Re: [PATCH 2/7] console: fix section mismatch warning in vgacon.c

[Sam Ravnborg]

On Fri, Jul 20, 2007 at 11:01:14PM -0700, Andrew Morton wrote:
> On Sat, 21 Jul 2007 07:43:59 +0200 Sam Ravnborg <sam@ravnborg.org> wrote:
> 
> > On Sat, Jul 21, 2007 at 07:37:29AM +0800, Antonino A. Daplas wrote:
> > > On Fri, 2007-07-20 at 23:27 +0200, Sam Ravnborg wrote:
> > > > Fix following section mismatch warning:
> > > > WARNING: vmlinux.o(.text+0x121e62): Section mismatch: reference to .init.text:__alloc_bootmem (between 'vgacon_startup' and 'vgacon_scrolldelta')
> > > > 
> > > > Browsing the code it seems that vgacon_scrollback_startup() is only
> > > > called during the init phase so the reference to the .init.text
> > > > section is OK.
> > > > Teach modpost not to warn using ___init_refok.
> > > > 
> > > > Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
> > > Acked-by: Antonino Daplas <adaplas@gmail.com>
> > 
> > Thanks. Will you take care of forwarding it it or do we rely
> > on Andrew in this area?
> > 
> 
> I tossed it into the next batch for Linus.  Tomorrow, I guess.

OK, thanks.

	Sam

Re: [PATCH 2/7] console: fix section mismatch warning in vgacon.c

[Geert Uytterhoeven]

On Sat, 21 Jul 2007, Antonino A. Daplas wrote:
> On Fri, 2007-07-20 at 23:27 +0200, Sam Ravnborg wrote:
> > Fix following section mismatch warning:
> > WARNING: vmlinux.o(.text+0x121e62): Section mismatch: reference to .init.text:__alloc_bootmem (between 'vgacon_startup' and 'vgacon_scrolldelta')
> > 
> > Browsing the code it seems that vgacon_scrollback_startup() is only
> > called during the init phase so the reference to the .init.text
> > section is OK.
> > Teach modpost not to warn using ___init_refok.
> > 
> > Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
> Acked-by: Antonino Daplas <adaplas@gmail.com>

I assume the check for `vga_init_done' in vgacon_startup() is sufficient to
prevent vgacon_scrollback_startup() from being called later due to
(un)bind_con_driver()?

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

Re: [PATCH 2/7] console: fix section mismatch warning in vgacon.c

[Antonino A. Daplas]

On Sun, 2007-07-22 at 12:20 +0200, Geert Uytterhoeven wrote:
> On Sat, 21 Jul 2007, Antonino A. Daplas wrote:
> > On Fri, 2007-07-20 at 23:27 +0200, Sam Ravnborg wrote:
> > > Fix following section mismatch warning:
> > > WARNING: vmlinux.o(.text+0x121e62): Section mismatch: reference to .init.text:__alloc_bootmem (between 'vgacon_startup' and 'vgacon_scrolldelta')
> > > 
> > > Browsing the code it seems that vgacon_scrollback_startup() is only
> > > called during the init phase so the reference to the .init.text
> > > section is OK.
> > > Teach modpost not to warn using ___init_refok.
> > > 
> > > Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
> > Acked-by: Antonino Daplas <adaplas@gmail.com>
> 
> I assume the check for `vga_init_done' in vgacon_startup() is sufficient to
> prevent vgacon_scrollback_startup() from being called later due to
> (un)bind_con_driver()?
> 

Yes.

Tony