Commit ebaf4fc1 authored Jul 15, 2007 by Sam Ravnborg Committed by Linus Torvalds Jul 16, 2007

alpha: fix trivial section mismatch warnings

Fix the following section mismatch warnings:
WARNING: arch/alpha/kernel/built-in.o(.text+0x7c78): Section mismatch: reference to .init.text:init_rtc_irq (between 'common_init_rtc' and 'timer_interrupt')
WARNING: arch/alpha/kernel/built-in.o(.text+0x7c7c): Section mismatch: reference to .init.text:init_rtc_irq (between 'common_init_rtc' and 'timer_interrupt')
WARNING: arch/alpha/kernel/built-in.o(.data+0x2c30): Section mismatch: reference to .init.text:srm_console_setup (between 'srmcons' and 'tsunami_pci_ops')

In all three cases functions marked __init was called outside __init context.
So the fix was to just drop the __init attribute.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Meelis Roos <mroos@linux.ee>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Richard Henderson <rth@twiddle.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 2fea299f

arch/alpha/kernel/srmcons.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -289,7 +289,7 @@ srm_console_device(struct console co, int index)
	return srmcons_driver;		return srmcons_driver;
	}		}

	static int __init		static int
	srm_console_setup(struct console co, char options)		srm_console_setup(struct console co, char options)
	{		{
	return 0;		return 0;

arch/alpha/kernel/sys_marvel.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -420,7 +420,7 @@ marvel_init_pci(void)
	io7_clear_errors(io7);		io7_clear_errors(io7);
	}		}

	static void		static void __init
	marvel_init_rtc(void)		marvel_init_rtc(void)
	{		{
	init_rtc_irq();		init_rtc_irq();

arch/alpha/kernel/time.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -144,7 +144,7 @@ irqreturn_t timer_interrupt(int irq, void *dev)
	return IRQ_HANDLED;		return IRQ_HANDLED;
	}		}

	void		void __init
	common_init_rtc(void)		common_init_rtc(void)
	{		{
	unsigned char x;		unsigned char x;