Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 162183
b: refs/heads/master
c: 4a66384
h: refs/heads/master
i:
  162181: aa183cc
  162179: 336230e
  162175: c83c15f
v: v3
  • Loading branch information
Greg Kroah-Hartman committed Sep 15, 2009
1 parent fad8e59 commit 64518bc
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 38 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f931a70c370cc826191a51a79500b34cd592b25b
refs/heads/master: 4a66384567dfa68fb0bf6604842b1262e601d4a2
4 changes: 2 additions & 2 deletions trunk/drivers/staging/hv/Hv.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
35 changes: 0 additions & 35 deletions trunk/drivers/staging/hv/include/osd.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 64518bc

Please sign in to comment.