Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 56675
b: refs/heads/master
c: d0aff6e
h: refs/heads/master
i:
  56673: 90fc7df
  56671: 12a3856
v: v3
  • Loading branch information
john stultz authored and Linus Torvalds committed May 21, 2007
1 parent 91e97d7 commit 2035fb4
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 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: d8902bfcacde6001e1b11bb06137c3bae3ae52d0
refs/heads/master: d0aff6e6f4e54f79f9c89d147d371bad384454e9
5 changes: 4 additions & 1 deletion trunk/arch/x86_64/kernel/vsyscall.c
Original file line number Diff line number Diff line change
Expand Up @@ -175,10 +175,13 @@ int __vsyscall(0) vgettimeofday(struct timeval * tv, struct timezone * tz)
* unlikely */
time_t __vsyscall(1) vtime(time_t *t)
{
struct timeval tv;
time_t result;
if (unlikely(!__vsyscall_gtod_data.sysctl_enabled))
return time_syscall(t);
result = __vsyscall_gtod_data.wall_time_sec;

vgettimeofday(&tv, 0);
result = tv.tv_sec;
if (t)
*t = result;
return result;
Expand Down

0 comments on commit 2035fb4

Please sign in to comment.