Commit 9ef231a4 authored Jul 21, 2007 by Sam Ravnborg Committed by Linus Torvalds Jul 21, 2007

i386: fix section mismatch warnings in mtrr

Following section mismatch warnings were reported by Andrey Borzenkov:

WARNING: arch/i386/kernel/built-in.o - Section mismatch: reference to .init.text:amd_init_mtrr from .text between 'mtrr_bp_init' (at offset 0x967a) and 'mtrr_attrib_to_str'
WARNING: arch/i386/kernel/built-in.o - Section mismatch: reference to .init.text:cyrix_init_mtrr from .text between 'mtrr_bp_init' (at offset 0x967f) and 'mtrr_attrib_to_str'
WARNING: arch/i386/kernel/built-in.o - Section mismatch: reference to .init.text:centaur_init_mtrr from .text between 'mtrr_bp_init' (at offset 0x9684) and 'mtrr_attrib_to_str'
WARNING: arch/i386/kernel/built-in.o - Section mismatch: reference to .init.text: from .text between 'get_mtrr_state' (at offset 0xa735) and 'generic_get_mtrr'
WARNING: arch/i386/kernel/built-in.o - Section mismatch: reference to .init.text: from .text between 'get_mtrr_state' (at offset 0xa749) and 'generic_get_mtrr'
WARNING: arch/i386/kernel/built-in.o - Section mismatch: reference to .init.text: from .text between 'get_mtrr_state' (at offset 0xa770) and 'generic_get_mtrr'

It was tracked down to a few functions missing __init tag.
Compile tested only.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 8b937898

arch/i386/kernel/cpu/mtrr/generic.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -79,7 +79,7 @@ static void print_fixed(unsigned base, unsigned step, const mtrr_type*types)
		}

		/* Grab all of the MTRR state for this CPU into state /
		void get_mtrr_state(void)
		void __init get_mtrr_state(void)
		{
		unsigned int i;
		struct mtrr_var_range *vrs;

arch/i386/kernel/cpu/mtrr/main.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -643,7 +643,7 @@ static struct sysdev_driver mtrr_sysdev_driver = {
		* initialized (i.e. before smp_init()).
		*
		*/
		__init void mtrr_bp_init(void)
		void __init mtrr_bp_init(void)
		{
		init_ifs();