Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 64901
b: refs/heads/master
c: 95b0867
h: refs/heads/master
i:
  64899: 811110e
v: v3
  • Loading branch information
Andi Kleen authored and Linus Torvalds committed Sep 12, 2007
1 parent 33dc8f2 commit 43b99b0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 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: 99364df764bbef327be2f8b8ffcfbb41a4a1af4d
refs/heads/master: 95b08679963c78ce0d675224a6efdb5169f2bf75
5 changes: 3 additions & 2 deletions trunk/arch/x86_64/vdso/vclock_gettime.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,11 @@ static long vdso_fallback_gettime(long clock, struct timespec *ts)

static inline long vgetns(void)
{
long v;
cycles_t (*vread)(void);
vread = gtod->clock.vread;
return ((vread() - gtod->clock.cycle_last) * gtod->clock.mult) >>
gtod->clock.shift;
v = (vread() - gtod->clock.cycle_last) & gtod->clock.mask;
return (v * gtod->clock.mult) >> gtod->clock.shift;
}

static noinline int do_realtime(struct timespec *ts)
Expand Down

0 comments on commit 43b99b0

Please sign in to comment.