mirror of
https://github.com/adulau/aha.git
synced 2024-12-29 12:16:20 +00:00
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: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
f931a70c37
commit
4a66384567
2 changed files with 2 additions and 37 deletions
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue