: __init to __cpuinit in mtrr code
PATCH 1/1 : __init to __cpuinit in mtrr code
(Resending to wider audience)
__init to __cpuinit in mtrr code.
Resolves warnings similar to:
WARNING: vmlinux - Section mismatch: reference to .init.text:mtrr_bp_init from .text between 'identify_cpu' (at offset 0xc040b38e) and 'detect_ht'
Signed-off-by Prarit Bhargava <[email protected]>
arch/i386/kernel/cpu/mtrr/amd.c +1 -1
@@ -112,7 +112,7 @@ static struct mtrr_ops amd_mtrr_ops = { .have_wrcomb = positive_have_wrcomb, }; -int __init amd_init_mtrr (void ) +int __cpuinit amd_init_mtrr (void ) {set_mtrr_ops (&amd_mtrr_ops);return 0 ;
arch/i386/kernel/cpu/mtrr/centaur.c +1 -1
@@ -215,7 +215,7 @@ static struct mtrr_ops centaur_mtrr_ops = { .have_wrcomb = positive_have_wrcomb, }; -int __init centaur_init_mtrr (void ) +int __cpuinit centaur_init_mtrr (void ) {set_mtrr_ops (¢aur_mtrr_ops);return 0 ;
arch/i386/kernel/cpu/mtrr/cyrix.c +1 -1
@@ -370,7 +370,7 @@ static struct mtrr_ops cyrix_mtrr_ops = { .have_wrcomb = positive_have_wrcomb, }; -int __init cyrix_init_mtrr (void ) +int __cpuinit cyrix_init_mtrr (void ) {set_mtrr_ops (&cyrix_mtrr_ops);return 0 ;
arch/i386/kernel/cpu/mtrr/generic.c +3 -3
@@ -30,14 +30,14 @@ static __initdata 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 __cpuinit get_mtrr_var_range (unsigned int index,struct mtrr_var_range *vr) {rdmsr (MTRRphysBase_MSR (index), vr->base_lo, vr->base_hi);rdmsr (MTRRphysMask_MSR (index), vr->mask_lo, vr->mask_hi); } -static void __init +static void __cpuinit get_fixed_ranges (mtrr_type * frs) {unsigned int *p = (unsigned int *) frs;
@@ -60,7 +60,7 @@ static void __init print_fixed(unsigned base, unsigned step, const mtrr_type*typ }/* Grab all of the MTRR state for this CPU into *state */ -void __init get_mtrr_state (void ) +void __cpuinit get_mtrr_state (void ) {unsigned int i;struct mtrr_var_range *vrs;
arch/i386/kernel/cpu/mtrr/main.c +4 -4
@@ -103,7 +103,7 @@ static int have_wrcomb(void) }/* This function returns the number of variable MTRRs */ -static void __init set_num_var_ranges (void ) +static void __cpuinit set_num_var_ranges (void ) {unsigned long config =0 , dummy;
@@ -116,7 +116,7 @@ static void __init set_num_var_ranges(void) num_var_ranges = config &0xff ; } -static void __init init_table (void ) +static void __cpuinit init_table (void ) {int i, max;
@@ -571,7 +571,7 @@ extern void amd_init_mtrr(void);extern void cyrix_init_mtrr (void );extern void centaur_init_mtrr (void ); -static void __init init_ifs (void ) +static void __cpuinit init_ifs (void ) {#ifndef CONFIG_X86_64 amd_init_mtrr ();
@@ -639,7 +639,7 @@ static struct sysdev_driver mtrr_sysdev_driver = {* initialized (i.e. before smp_init()). * */ -void __init mtrr_bp_init (void ) +void __cpuinit mtrr_bp_init (void ) {init_ifs ();