Commit:     df652fe173c12d29960f3a8eafce29041e86b942
Parent:     f363d16fbb9374c0bd7f2757d412c287169094c9
Author:     Bernhard Walle <[EMAIL PROTECTED]>
AuthorDate: Wed May 16 22:11:06 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Thu May 17 05:23:04 2007 -0700

    i386/x86-64: fix section mismatch
    WARNING: arch/x86_64/kernel/built-in.o - Section mismatch: reference to
    .init.text:mtrr_bp_init from .text between 'id entify_cpu' (at offset 
    and 'IRQ0x20_interrupt'
    It's because identify_cpu() which is __cpuinit calls mtrr_bp_init() which is
    __init(). __cpuinit() expands to nothing if CONFIG_HOTPLUG_CPU=y and so the
    call is illegal.
    Signed-off-by: Bernhard Walle <[EMAIL PROTECTED]>
    Cc: Andi Kleen <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 arch/i386/kernel/cpu/mtrr/generic.c |    2 +-
 arch/i386/kernel/cpu/mtrr/main.c    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/i386/kernel/cpu/mtrr/generic.c 
index 5367e32..c4ebb51 100644
--- a/arch/i386/kernel/cpu/mtrr/generic.c
+++ b/arch/i386/kernel/cpu/mtrr/generic.c
@@ -78,7 +78,7 @@ static void __cpuinit print_fixed(unsigned base, unsigned 
step, const mtrr_type*
 /*  Grab all of the MTRR state for this CPU into *state  */
-void __init get_mtrr_state(void)
+void get_mtrr_state(void)
        unsigned int i;
        struct mtrr_var_range *vrs;
diff --git a/arch/i386/kernel/cpu/mtrr/main.c b/arch/i386/kernel/cpu/mtrr/main.c
index 02a2f39..1cf466d 100644
--- a/arch/i386/kernel/cpu/mtrr/main.c
+++ b/arch/i386/kernel/cpu/mtrr/main.c
@@ -639,7 +639,7 @@ static struct sysdev_driver mtrr_sysdev_driver = {
  * initialized (i.e. before smp_init()).
-void __init mtrr_bp_init(void)
+void mtrr_bp_init(void)
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

Reply via email to