x86: Store a per-cpu shadow copy of CR4

[deliverable/linux.git] / arch / x86 / kernel / cpu / mtrr / cyrix.c

diff --git a/arch/x86/kernel/cpu/mtrr/cyrix.c b/arch/x86/kernel/cpu/mtrr/cyrix.c
index 9e451b0876b513ff34c38ba5cad0862b1f5fc3db..f8c81ba0b4651c02cd31f9a1117e64192e64e1d0 100644 (file)
--- a/arch/x86/kernel/cpu/mtrr/cyrix.c
+++ b/arch/x86/kernel/cpu/mtrr/cyrix.c
@@ -138,8 +138,8 @@ static void prepare_set(void)
 
        /*  Save value of CR4 and clear Page Global Enable (bit 7)  */
        if (cpu_has_pge) {
-               cr4 = read_cr4();
-               write_cr4(cr4 & ~X86_CR4_PGE);
+               cr4 = __read_cr4();
+               __write_cr4(cr4 & ~X86_CR4_PGE);
        }
 
        /*
@@ -171,7 +171,7 @@ static void post_set(void)
 
        /* Restore value of CR4 */
        if (cpu_has_pge)
-               write_cr4(cr4);
+               __write_cr4(cr4);
 }
 
 static void cyrix_set_arr(unsigned int reg, unsigned long base,