Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 89070
b: refs/heads/master
c: 1de87bd
h: refs/heads/master
v: v3
  • Loading branch information
Andi Kleen authored and Ingo Molnar committed Apr 17, 2008
1 parent 821fb51 commit 18328a0
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f5c24a7fd0798d636af184cc7032e7e0cb149112
refs/heads/master: 1de87bd40e119d26533b5135677901990390bfa9
8 changes: 8 additions & 0 deletions trunk/include/asm-x86/msr.h
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,14 @@ static inline int wrmsr_safe(unsigned msr, unsigned low, unsigned high)
__err; \
})

static inline int rdmsrl_safe(unsigned msr, unsigned long long *p)
{
int err;

*p = native_read_msr_safe(msr, &err);
return err;
}

#define rdtscl(low) \
((low) = (u32)native_read_tsc())

Expand Down
7 changes: 7 additions & 0 deletions trunk/include/asm-x86/paravirt.h
Original file line number Diff line number Diff line change
Expand Up @@ -693,6 +693,13 @@ do { \
_err; \
})

static inline int rdmsrl_safe(unsigned msr, unsigned long long *p)
{
int err;

*p = paravirt_read_msr(msr, &err);
return err;
}

static inline u64 paravirt_read_tsc(void)
{
Expand Down

0 comments on commit 18328a0

Please sign in to comment.