diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/hv/Hv.h | 4 | ||||
| -rw-r--r-- | drivers/staging/hv/include/osd.h | 35 |
2 files changed, 2 insertions, 37 deletions
diff --git a/drivers/staging/hv/Hv.h b/drivers/staging/hv/Hv.h index b5ea3dcc6f1..694c96b8b06 100644 --- a/drivers/staging/hv/Hv.h +++ b/drivers/staging/hv/Hv.h @@ -133,14 +133,14 @@ static inline unsigned long long ReadMsr(int msr) { unsigned long long val; - RDMSR(msr, val); + rdmsrl(msr, val); return val; } static inline void WriteMsr(int msr, u64 val) { - WRMSR(msr, val); + wrmsrl(msr, val); return; } diff --git a/drivers/staging/hv/include/osd.h b/drivers/staging/hv/include/osd.h index 0444c18990d..a3e2e29cf33 100644 --- a/drivers/staging/hv/include/osd.h +++ b/drivers/staging/hv/include/osd.h @@ -66,41 +66,6 @@ struct osd_timer { }; - -#ifdef __x86_64__ - -#define RDMSR(reg, v) { \ - u32 h, l; \ - __asm__ __volatile__("rdmsr" \ - : "=a" (l), "=d" (h) \ - : "c" (reg)); \ - v = (((u64)h) << 32) | l; \ -} - -#define WRMSR(reg, v) { \ - u32 h, l; \ - l = (u32)(((u64)(v)) & 0xFFFFFFFF); \ - h = (u32)((((u64)(v)) >> 32) & 0xFFFFFFFF); \ - __asm__ __volatile__("wrmsr" \ - : /* no outputs */ \ - : "c" (reg), "a" (l), "d" (h)); \ -} - -#else - -#define RDMSR(reg, v) \ - __asm__ __volatile__("rdmsr" \ - : "=A" (v) \ - : "c" (reg)) - -#define WRMSR(reg, v) \ - __asm__ __volatile__("wrmsr" \ - : /* no outputs */ \ - : "c" (reg), "A" ((u64)v)) - -#endif - - /* Osd routines */ extern void* VirtualAllocExec(unsigned int size); |