From 66c7f95abfddaa2bee02e7354b8c92a7eee8887f Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Sun, 22 Feb 2004 07:06:00 -0800 Subject: [PATCH] [PATCH] mtrr: init section usage From: "Randy.Dunlap" This patch tries to clean up init section usage in arch/i386/kernel/cpu/mtrr/*.c. --- arch/i386/kernel/cpu/mtrr/generic.c | 6 +++--- arch/i386/kernel/cpu/mtrr/main.c | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/i386/kernel/cpu/mtrr/generic.c b/arch/i386/kernel/cpu/mtrr/generic.c index e832dbca927ce..3877f78f33468 100644 --- a/arch/i386/kernel/cpu/mtrr/generic.c +++ b/arch/i386/kernel/cpu/mtrr/generic.c @@ -45,7 +45,7 @@ get_fixed_ranges(mtrr_type * frs) } /* 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; @@ -142,7 +142,7 @@ void generic_get_mtrr(unsigned int reg, unsigned long *base, *type = base_lo & 0xff; } -static int __init set_fixed_ranges(mtrr_type * frs) +static int set_fixed_ranges(mtrr_type * frs) { unsigned int *p = (unsigned int *) frs; int changed = FALSE; @@ -177,7 +177,7 @@ static int __init set_fixed_ranges(mtrr_type * frs) /* Set the MSR pair relating to a var range. Returns TRUE if changes are made */ -static int __init set_mtrr_var_ranges(unsigned int index, struct mtrr_var_range *vr) +static int set_mtrr_var_ranges(unsigned int index, struct mtrr_var_range *vr) { unsigned int lo, hi; int changed = FALSE; diff --git a/arch/i386/kernel/cpu/mtrr/main.c b/arch/i386/kernel/cpu/mtrr/main.c index 3c71703a34e0c..959f573787954 100644 --- a/arch/i386/kernel/cpu/mtrr/main.c +++ b/arch/i386/kernel/cpu/mtrr/main.c @@ -111,7 +111,7 @@ void __init set_num_var_ranges(void) num_var_ranges = config & 0xff; } -static void init_table(void) +static void __init init_table(void) { int i, max; @@ -541,7 +541,7 @@ static void __init init_ifs(void) centaur_init_mtrr(); } -static void init_other_cpus(void) +static void __init init_other_cpus(void) { if (use_intel()) get_mtrr_state(); @@ -608,7 +608,7 @@ static struct sysdev_driver mtrr_sysdev_driver = { /** - * mtrr_init - initialie mtrrs on the boot CPU + * mtrr_init - initialize mtrrs on the boot CPU * * This needs to be called early; before any of the other CPUs are * initialized (i.e. before smp_init()). @@ -618,7 +618,7 @@ static int __init mtrr_init(void) { init_ifs(); - if ( cpu_has_mtrr ) { + if (cpu_has_mtrr) { mtrr_if = &generic_mtrr_ops; size_or_mask = 0xff000000; /* 36 bits */ size_and_mask = 0x00f00000; @@ -660,7 +660,7 @@ static int __init mtrr_init(void) } else { switch (boot_cpu_data.x86_vendor) { case X86_VENDOR_AMD: - if ( cpu_has_k6_mtrr ) { + if (cpu_has_k6_mtrr) { /* Pre-Athlon (K6) AMD CPU MTRRs */ mtrr_if = mtrr_ops[X86_VENDOR_AMD]; size_or_mask = 0xfff00000; /* 32 bits */ @@ -668,14 +668,14 @@ static int __init mtrr_init(void) } break; case X86_VENDOR_CENTAUR: - if ( cpu_has_centaur_mcr ) { + if (cpu_has_centaur_mcr) { mtrr_if = mtrr_ops[X86_VENDOR_CENTAUR]; size_or_mask = 0xfff00000; /* 32 bits */ size_and_mask = 0; } break; case X86_VENDOR_CYRIX: - if ( cpu_has_cyrix_arr ) { + if (cpu_has_cyrix_arr) { mtrr_if = mtrr_ops[X86_VENDOR_CYRIX]; size_or_mask = 0xfff00000; /* 32 bits */ size_and_mask = 0; -- 2.53.0