Commit:     bf8c4817427de0744e9c008d3ad5a7635e41e397
Parent:     018d2ad0cccfa9bb8bee1d160c353e568484a137
Author:     Yinghai Lu <[EMAIL PROTECTED]>
AuthorDate: Wed Jun 20 12:23:39 2007 +0200
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Wed Jun 20 14:27:26 2007 -0700

    x86_64: fix link warning between for .text and .init.text
    WARNING: arch/x86_64/kernel/built-in.o(.text+0xace9): Section mismatch: 
reference to .init.text: (between 'get_mtrr_state' and 'mtrr_wrmsr')
    WARNING: arch/x86_64/kernel/built-in.o(.text+0xad09): Section mismatch: 
reference to .init.text: (between 'get_mtrr_state' and 'mtrr_wrmsr')
    WARNING: arch/x86_64/kernel/built-in.o(.text+0xad38): Section mismatch: 
reference to .init.text: (between 'get_mtrr_state' and 'mtrr_wrmsr')
    WARNING: drivers/built-in.o(.text+0x3a680): Section mismatch: reference to 
.init.text:acpi_map_pxm_to_node (between 'acpi_get_node' and 'acpi_lock_ac_dir')
    AK: also marked mtrr_bp_init __init to avoid some more warnings
    Signed-off-by: Yinghai Lu <[EMAIL PROTECTED]>
    Signed-off-by: Andi Kleen <[EMAIL PROTECTED]>
    Acked-by: Jan Beulich <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 arch/i386/kernel/cpu/mtrr/generic.c |    4 ++--
 arch/i386/kernel/cpu/mtrr/main.c    |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/i386/kernel/cpu/mtrr/generic.c 
index c4ebb51..6d59378 100644
--- a/arch/i386/kernel/cpu/mtrr/generic.c
+++ b/arch/i386/kernel/cpu/mtrr/generic.c
@@ -42,7 +42,7 @@ static int mtrr_show;
 module_param_named(show, mtrr_show, bool, 0);
 /*  Get the MSR pair relating to a var range  */
-static void __init
+static void
 get_mtrr_var_range(unsigned int index, struct mtrr_var_range *vr)
        rdmsr(MTRRphysBase_MSR(index), vr->base_lo, vr->base_hi);
@@ -68,7 +68,7 @@ void mtrr_save_fixed_ranges(void *info)
-static void __cpuinit print_fixed(unsigned base, unsigned step, const 
+static void print_fixed(unsigned base, unsigned step, const mtrr_type*types)
        unsigned i;
diff --git a/arch/i386/kernel/cpu/mtrr/main.c b/arch/i386/kernel/cpu/mtrr/main.c
index 7202b98..55b0051 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 mtrr_bp_init(void)
+__init 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