diff options
author | Yinghai Lu <yhlu.kernel@gmail.com> | 2007-06-20 06:23:39 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-20 17:27:26 -0400 |
commit | bf8c4817427de0744e9c008d3ad5a7635e41e397 (patch) | |
tree | b4cea35df30174d12c0a5d5503cfa71ea9de2fe5 | |
parent | 018d2ad0cccfa9bb8bee1d160c353e568484a137 (diff) |
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 <yhlu.kernel@gmail.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Acked-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/i386/kernel/cpu/mtrr/generic.c | 4 | ||||
-rw-r--r-- | 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 b/arch/i386/kernel/cpu/mtrr/generic.c index c4ebb5126ef7..6d5937891b46 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; | |||
42 | module_param_named(show, mtrr_show, bool, 0); | 42 | module_param_named(show, mtrr_show, bool, 0); |
43 | 43 | ||
44 | /* Get the MSR pair relating to a var range */ | 44 | /* Get the MSR pair relating to a var range */ |
45 | static void __init | 45 | static void |
46 | get_mtrr_var_range(unsigned int index, struct mtrr_var_range *vr) | 46 | get_mtrr_var_range(unsigned int index, struct mtrr_var_range *vr) |
47 | { | 47 | { |
48 | rdmsr(MTRRphysBase_MSR(index), vr->base_lo, vr->base_hi); | 48 | rdmsr(MTRRphysBase_MSR(index), vr->base_lo, vr->base_hi); |
@@ -68,7 +68,7 @@ void mtrr_save_fixed_ranges(void *info) | |||
68 | get_fixed_ranges(mtrr_state.fixed_ranges); | 68 | get_fixed_ranges(mtrr_state.fixed_ranges); |
69 | } | 69 | } |
70 | 70 | ||
71 | static void __cpuinit print_fixed(unsigned base, unsigned step, const mtrr_type*types) | 71 | static void print_fixed(unsigned base, unsigned step, const mtrr_type*types) |
72 | { | 72 | { |
73 | unsigned i; | 73 | unsigned i; |
74 | 74 | ||
diff --git a/arch/i386/kernel/cpu/mtrr/main.c b/arch/i386/kernel/cpu/mtrr/main.c index 7202b98aac4f..55b005152a11 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 = { | |||
639 | * initialized (i.e. before smp_init()). | 639 | * initialized (i.e. before smp_init()). |
640 | * | 640 | * |
641 | */ | 641 | */ |
642 | void mtrr_bp_init(void) | 642 | __init void mtrr_bp_init(void) |
643 | { | 643 | { |
644 | init_ifs(); | 644 | init_ifs(); |
645 | 645 | ||