projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'origin/master' into next
[deliverable/linux.git]
/
arch
/
s390
/
include
/
asm
/
cputime.h
diff --git
a/arch/s390/include/asm/cputime.h
b/arch/s390/include/asm/cputime.h
index 521726430afac81fcb19e870e4765a44fa85e528..95b0f7db3c69dcb076c7969ceacba1f5ab2f82b0 100644
(file)
--- a/
arch/s390/include/asm/cputime.h
+++ b/
arch/s390/include/asm/cputime.h
@@
-145,7
+145,7
@@
cputime_to_timeval(const cputime_t cputime, struct timeval *value)
value->tv_usec = rp.subreg.even / 4096;
value->tv_sec = rp.subreg.odd;
#else
- value->tv_usec =
cputime % 4096000000ULL
;
+ value->tv_usec =
(cputime % 4096000000ULL) / 4096
;
value->tv_sec = cputime / 4096000000ULL;
#endif
}
This page took
0.04532 seconds
and
5
git commands to generate.