Commit:     2b3b4835c94226681c496de9446d456dcf42ed08
Parent:     856f44ff4af6e57fdc39a8b2bec498c88438bd27
Author:     Bernhard Kaindl <[EMAIL PROTECTED]>
AuthorDate: Wed May 2 19:27:17 2007 +0200
Committer:  Andi Kleen <[EMAIL PROTECTED]>
CommitDate: Wed May 2 19:27:17 2007 +0200

    [PATCH] x86: Adds mtrr_save_fixed_ranges() for use in two later patches.
    In this current implementation which is used in other patches,
    mtrr_save_fixed_ranges() accepts a dummy void pointer because
    in the current implementation of one of these patches, this
    function may be called from smp_call_function_single() which
    requires that this function takes a void pointer argument.
    This function calls get_fixed_ranges(), passing mtrr_state.fixed_ranges
    which is the element of the static struct which stores our current
    backup of the fixed-range MTRR values which all CPUs shall be
    Because  mtrr_save_fixed_ranges calls get_fixed_ranges after
    kernel initialisation time, __init needs to be removed from
    the declaration of get_fixed_ranges().
    If CONFIG_MTRR is not set, we define mtrr_save_fixed_ranges
    as an empty statement because there is nothing to do.
    AK: Moved prototypes for x86-64 around to fix warnings
    Signed-off-by: Bernhard Kaindl <[EMAIL PROTECTED]>
    Signed-off-by: Andi Kleen <[EMAIL PROTECTED]>
    Cc: Andrew Morton <[EMAIL PROTECTED]>
    Cc: Andi Kleen <[EMAIL PROTECTED]>
    Cc: Dave Jones <[EMAIL PROTECTED]>
 arch/i386/kernel/cpu/mtrr/generic.c |    7 ++++++-
 include/asm-i386/mtrr.h             |    2 ++
 include/asm-x86_64/mtrr.h           |    2 ++
 3 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/arch/i386/kernel/cpu/mtrr/generic.c 
index 68b3837..150cf50 100644
--- a/arch/i386/kernel/cpu/mtrr/generic.c
+++ b/arch/i386/kernel/cpu/mtrr/generic.c
@@ -37,7 +37,7 @@ get_mtrr_var_range(unsigned int index, struct mtrr_var_range 
        rdmsr(MTRRphysMask_MSR(index), vr->mask_lo, vr->mask_hi);
-static void __init
+static void
 get_fixed_ranges(mtrr_type * frs)
        unsigned int *p = (unsigned int *) frs;
@@ -51,6 +51,11 @@ get_fixed_ranges(mtrr_type * frs)
                rdmsr(MTRRfix4K_C0000_MSR + i, p[6 + i * 2], p[7 + i * 2]);
+void mtrr_save_fixed_ranges(void *info)
+       get_fixed_ranges(mtrr_state.fixed_ranges);
 static void __init print_fixed(unsigned base, unsigned step, const 
        unsigned i;
diff --git a/include/asm-i386/mtrr.h b/include/asm-i386/mtrr.h
index 07f063a..02a41b9 100644
--- a/include/asm-i386/mtrr.h
+++ b/include/asm-i386/mtrr.h
@@ -69,6 +69,7 @@ struct mtrr_gentry
 /*  The following functions are for use by other drivers  */
 # ifdef CONFIG_MTRR
+extern void mtrr_save_fixed_ranges(void *);
 extern int mtrr_add (unsigned long base, unsigned long size,
                     unsigned int type, char increment);
 extern int mtrr_add_page (unsigned long base, unsigned long size,
@@ -79,6 +80,7 @@ extern void mtrr_centaur_report_mcr(int mcr, u32 lo, u32 hi);
 extern void mtrr_ap_init(void);
 extern void mtrr_bp_init(void);
 #  else
+#define mtrr_save_fixed_ranges(arg) do {} while (0)
 static __inline__ int mtrr_add (unsigned long base, unsigned long size,
                                unsigned int type, char increment)
diff --git a/include/asm-x86_64/mtrr.h b/include/asm-x86_64/mtrr.h
index 66809ec..1b326cb 100644
--- a/include/asm-x86_64/mtrr.h
+++ b/include/asm-x86_64/mtrr.h
@@ -138,9 +138,11 @@ struct mtrr_gentry32
 extern void mtrr_ap_init(void);
 extern void mtrr_bp_init(void);
+extern void mtrr_save_fixed_ranges(void *);
 #define mtrr_ap_init() do {} while (0)
 #define mtrr_bp_init() do {} while (0)
+#define mtrr_save_fixed_ranges(arg) do {} while (0)
 #endif /* __KERNEL__ */
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to