[PATCH] [16/34] i386: fix mtrr sections




From: Randy Dunlap <randy.dunlap@xxxxxxxxxx>

Fix section mismatch warnings in mtrr code.
Fix line length on one source line.

WARNING: arch/x86_64/kernel/built-in.o - Section mismatch: reference to .init.data: from .text.get_mtrr_state after 'get_mtrr_state' (at offset 0x103)
WARNING: arch/x86_64/kernel/built-in.o - Section mismatch: reference to .init.text: from .text.get_mtrr_state after 'get_mtrr_state' (at offset 0x180)
WARNING: arch/x86_64/kernel/built-in.o - Section mismatch: reference to .init.text: from .text.get_mtrr_state after 'get_mtrr_state' (at offset 0x199)
WARNING: arch/x86_64/kernel/built-in.o - Section mismatch: reference to .init.text: from .text.get_mtrr_state after 'get_mtrr_state' (at offset 0x1c1)

Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Signed-off-by: Andi Kleen <ak@xxxxxxx>
Cc: Andi Kleen <ak@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

arch/i386/kernel/cpu/mtrr/generic.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)

Index: linux/arch/i386/kernel/cpu/mtrr/generic.c
===================================================================
--- linux.orig/arch/i386/kernel/cpu/mtrr/generic.c
+++ linux/arch/i386/kernel/cpu/mtrr/generic.c
@@ -38,7 +38,7 @@ static struct mtrr_state mtrr_state = {}
#undef MODULE_PARAM_PREFIX
#define MODULE_PARAM_PREFIX "mtrr."

-static __initdata int mtrr_show;
+static int mtrr_show;
module_param_named(show, mtrr_show, bool, 0);

/* Get the MSR pair relating to a var range */
@@ -68,12 +68,13 @@ void mtrr_save_fixed_ranges(void *info)
get_fixed_ranges(mtrr_state.fixed_ranges);
}

-static void __init print_fixed(unsigned base, unsigned step, const mtrr_type*types)
+static void __cpuinit print_fixed(unsigned base, unsigned step, const mtrr_type*types)
{
unsigned i;

for (i = 0; i < 8; ++i, ++types, base += step)
- printk(KERN_INFO "MTRR %05X-%05X %s\n", base, base + step - 1, mtrr_attrib_to_str(*types));
+ printk(KERN_INFO "MTRR %05X-%05X %s\n",
+ base, base + step - 1, mtrr_attrib_to_str(*types));
}

/* Grab all of the MTRR state for this CPU into *state */
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/



Relevant Pages

  • [PATCH -mm] fix mtrr sections
    ... Fix section mismatch warnings in mtrr code. ... #undef MODULE_PARAM_PREFIX ... +static int mtrr_show; ...
    (Linux-Kernel)
  • please pull from the trivial tree
    ... Spelling fix in IPW2100 and IPW2200 Kconfig entries ... better list for "POSIX CLOCKS and TIMERS" ... static int users = 0; ... static void stl_cd1400setreg ...
    (Linux-Kernel)
  • Re: Excellent job on the firewire support!
    ... > firewire driver - mainly that my freebsd boxes often go haywire when I ... > for freebsd to be a fully functional isochronous bus manager. ... Try this patch for temporary fix. ... static int fwipdebug = 0; ...
    (freebsd-current)
  • Re: Excellent job on the firewire support!
    ... > firewire driver - mainly that my freebsd boxes often go haywire when I ... > for freebsd to be a fully functional isochronous bus manager. ... Try this patch for temporary fix. ... static int fwipdebug = 0; ...
    (freebsd-current)
  • Re: [PATCH] Add nid sanity on alloc_pages_node
    ... On Thu, 12 Jul 2007, Andrew Morton wrote: ... It'd be much better to fix the race within alloc_fresh_huge_page. ... static int alloc_fresh_huge_page ...
    (Linux-Kernel)