Merge branches 'pm-core', 'pm-qos', 'pm-domains' and 'pm-opp'

[linux.git] / arch / x86 / include / asm / microcode.h

diff --git a/arch/x86/include/asm/microcode.h b/arch/x86/include/asm/microcode.h
index 2266f864b7477a3ff88fee26f07df62eb5073ab4..daadeeea00b1ec97dd04f2eea2c9e2fab50c7086 100644 (file)
--- a/arch/x86/include/asm/microcode.h
+++ b/arch/x86/include/asm/microcode.h
@@ -7,18 +7,17 @@
 
 #define native_rdmsr(msr, val1, val2)                  \
 do {                                                   \
-       u64 __val = native_read_msr((msr));             \
+       u64 __val = __rdmsr((msr));                     \
        (void)((val1) = (u32)__val);                    \
        (void)((val2) = (u32)(__val >> 32));            \
 } while (0)
 
 #define native_wrmsr(msr, low, high)                   \
-       native_write_msr(msr, low, high)
+       __wrmsr(msr, low, high)
 
 #define native_wrmsrl(msr, val)                                \
-       native_write_msr((msr),                         \
-                        (u32)((u64)(val)),             \
-                        (u32)((u64)(val) >> 32))
+       __wrmsr((msr), (u32)((u64)(val)),               \
+                      (u32)((u64)(val) >> 32))
 
 struct ucode_patch {
        struct list_head plist;