---

yaml --- r: 131538 b: refs/heads/master c: d5cd034 h: refs/heads/master v: v3
git-mirror · Feb 19, 2009 · 7ecb715 · 7ecb715
1 parent b54f1d6
commit 7ecb715
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e2e5a0f2b100a5204d27def8bbf73333d1710be2
+refs/heads/master: d5cd0343d2878b66e25e044f644563c6bf708833
diff --git a/trunk/arch/s390/include/asm/cputime.h b/trunk/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
 }