vserver 2.0 rc7

[linux-2.6.git] / arch / i386 / kernel / cpu / mtrr / mtrr.h

diff --git a/arch/i386/kernel/cpu/mtrr/mtrr.h b/arch/i386/kernel/cpu/mtrr/mtrr.h
index 0d10c11..de13512 100644 (file)
--- a/arch/i386/kernel/cpu/mtrr/mtrr.h
+++ b/arch/i386/kernel/cpu/mtrr/mtrr.h
@@ -37,7 +37,7 @@ typedef u8 mtrr_type;
 struct mtrr_ops {
        u32     vendor;
        u32     use_intel_if;
-       void    (*init)(void);
+//     void    (*init)(void);
        void    (*set)(unsigned int reg, unsigned long base,
                       unsigned long size, mtrr_type type);
        void    (*set_all)(void);
@@ -57,7 +57,6 @@ extern int generic_validate_add_page(unsigned long base, unsigned long size,
 
 extern struct mtrr_ops generic_mtrr_ops;
 
-extern int generic_have_wrcomb(void);
 extern int positive_have_wrcomb(void);
 
 /* library functions for processor-specific routines */
@@ -95,5 +94,5 @@ extern unsigned int num_var_ranges;
 void finalize_mtrr_state(void);
 void mtrr_state_warn(void);
 char *mtrr_attrib_to_str(int x);
+void mtrr_wrmsr(unsigned, unsigned, unsigned);
 
-extern char * mtrr_if_name[];