diff options
author | Sam Ravnborg <sam@ravnborg.org> | 2007-07-16 02:38:37 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-16 12:05:37 -0400 |
commit | ebaf4fc13e293dcafbb13c91aae2a45722652740 (patch) | |
tree | f90cc463b80b7cdb4b14b65d95375b573f48a188 | |
parent | 2fea299f74c846157b068be8ae15b406db0719d9 (diff) |
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>
-rw-r--r-- | arch/alpha/kernel/srmcons.c | 2 | ||||
-rw-r--r-- | arch/alpha/kernel/sys_marvel.c | 2 | ||||
-rw-r--r-- | arch/alpha/kernel/time.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/alpha/kernel/srmcons.c b/arch/alpha/kernel/srmcons.c index 930cedc8be24..783f4e50c111 100644 --- a/arch/alpha/kernel/srmcons.c +++ b/arch/alpha/kernel/srmcons.c | |||
@@ -289,7 +289,7 @@ srm_console_device(struct console *co, int *index) | |||
289 | return srmcons_driver; | 289 | return srmcons_driver; |
290 | } | 290 | } |
291 | 291 | ||
292 | static int __init | 292 | static int |
293 | srm_console_setup(struct console *co, char *options) | 293 | srm_console_setup(struct console *co, char *options) |
294 | { | 294 | { |
295 | return 0; | 295 | return 0; |
diff --git a/arch/alpha/kernel/sys_marvel.c b/arch/alpha/kernel/sys_marvel.c index 0bcb968cb60a..922143ea1cdb 100644 --- a/arch/alpha/kernel/sys_marvel.c +++ b/arch/alpha/kernel/sys_marvel.c | |||
@@ -420,7 +420,7 @@ marvel_init_pci(void) | |||
420 | io7_clear_errors(io7); | 420 | io7_clear_errors(io7); |
421 | } | 421 | } |
422 | 422 | ||
423 | static void | 423 | static void __init |
424 | marvel_init_rtc(void) | 424 | marvel_init_rtc(void) |
425 | { | 425 | { |
426 | init_rtc_irq(); | 426 | init_rtc_irq(); |
diff --git a/arch/alpha/kernel/time.c b/arch/alpha/kernel/time.c index 4748e14a28bc..1dd50d07693c 100644 --- a/arch/alpha/kernel/time.c +++ b/arch/alpha/kernel/time.c | |||
@@ -144,7 +144,7 @@ irqreturn_t timer_interrupt(int irq, void *dev) | |||
144 | return IRQ_HANDLED; | 144 | return IRQ_HANDLED; |
145 | } | 145 | } |
146 | 146 | ||
147 | void | 147 | void __init |
148 | common_init_rtc(void) | 148 | common_init_rtc(void) |
149 | { | 149 | { |
150 | unsigned char x; | 150 | unsigned char x; |