Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 14719
b: refs/heads/master
c: ee500f2
h: refs/heads/master
i:
  14717: 3bfcf9f
  14715: c15bffd
  14711: d29b3c9
  14703: e2d2ab2
  14687: 37eaedc
  14655: 5bb6e3e
  14591: 0d7116b
v: v3
  • Loading branch information
Oleg Nesterov authored and Linus Torvalds committed Nov 28, 2005
1 parent c3fe57d commit 029f646
Show file tree
Hide file tree
Showing 2 changed files with 2 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: 46596338a10a54550ff03a6f60c28145a080296b
refs/heads/master: ee500f274914653a7d3dfca7d0140a3d21658e32
2 changes: 1 addition & 1 deletion trunk/kernel/posix-cpu-timers.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ timespec_to_sample(clockid_t which_clock, const struct timespec *tp)
union cpu_time_count ret;
ret.sched = 0; /* high half always zero when .cpu used */
if (CPUCLOCK_WHICH(which_clock) == CPUCLOCK_SCHED) {
ret.sched = tp->tv_sec * NSEC_PER_SEC + tp->tv_nsec;
ret.sched = (unsigned long long)tp->tv_sec * NSEC_PER_SEC + tp->tv_nsec;
} else {
ret.cpu = timespec_to_cputime(tp);
}
Expand Down

0 comments on commit 029f646

Please sign in to comment.