x86: Use this_cpu_ops to optimize code

[mv-sheeva.git] / arch / x86 / kernel / cpu / mcheck / mce.c

diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index 7a35b72d7c039d633bd8a4c9179eb4e4a5b7a549..0c746af6c5eb30b9484203b615c80045928f059e 100644 (file)
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -326,7 +326,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
 
 static int msr_to_offset(u32 msr)
 {
-       unsigned bank = __get_cpu_var(injectm.bank);
+       unsigned bank = __this_cpu_read(injectm.bank);
 
        if (msr == rip_msr)
                return offsetof(struct mce, ip);
@@ -346,7 +346,7 @@ static u64 mce_rdmsrl(u32 msr)
 {
        u64 v;
 
-       if (__get_cpu_var(injectm).finished) {
+       if (__this_cpu_read(injectm.finished)) {
                int offset = msr_to_offset(msr);
 
                if (offset < 0)
@@ -369,7 +369,7 @@ static u64 mce_rdmsrl(u32 msr)
 
 static void mce_wrmsrl(u32 msr, u64 v)
 {
-       if (__get_cpu_var(injectm).finished) {
+       if (__this_cpu_read(injectm.finished)) {
                int offset = msr_to_offset(msr);
 
                if (offset >= 0)