Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=ebaf4fc13e293dcafbb13c91aae2a45722652740
Commit:     ebaf4fc13e293dcafbb13c91aae2a45722652740
Parent:     2fea299f74c846157b068be8ae15b406db0719d9
Author:     Sam Ravnborg <[EMAIL PROTECTED]>
AuthorDate: Sun Jul 15 23:38:37 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Mon Jul 16 09:05:37 2007 -0700

    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 <[EMAIL PROTECTED]>
    Cc: Meelis Roos <[EMAIL PROTECTED]>
    Cc: Ivan Kokshaysky <[EMAIL PROTECTED]>
    Cc: Richard Henderson <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 arch/alpha/kernel/srmcons.c    |    2 +-
 arch/alpha/kernel/sys_marvel.c |    2 +-
 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 930cedc..783f4e5 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)
        return srmcons_driver;
 }
 
-static int __init
+static int
 srm_console_setup(struct console *co, char *options)
 {
        return 0;
diff --git a/arch/alpha/kernel/sys_marvel.c b/arch/alpha/kernel/sys_marvel.c
index 0bcb968..922143e 100644
--- a/arch/alpha/kernel/sys_marvel.c
+++ b/arch/alpha/kernel/sys_marvel.c
@@ -420,7 +420,7 @@ marvel_init_pci(void)
                io7_clear_errors(io7);
 }
 
-static void
+static void __init
 marvel_init_rtc(void)
 {
        init_rtc_irq();
diff --git a/arch/alpha/kernel/time.c b/arch/alpha/kernel/time.c
index 4748e14..1dd50d0 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)
        return IRQ_HANDLED;
 }
 
-void
+void __init
 common_init_rtc(void)
 {
        unsigned char x;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to