Commit 4a663845 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Staging: hv: remove custom rdmsrl and wrmsrl functions

Use the ones that the kernel provides, they do it correctly.

Cc: Bill Pemberton <wfp5p@virginia.edu>
Cc: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent f931a70c
......@@ -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;
}
......
......@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment