From 7ecb7153b7d82734609daebab661409a7165b82d Mon Sep 17 00:00:00 2001 From: Christian Borntraeger Date: Thu, 19 Feb 2009 15:19:00 +0100 Subject: [PATCH] --- yaml --- r: 131538 b: refs/heads/master c: d5cd0343d2878b66e25e044f644563c6bf708833 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/s390/include/asm/cputime.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index fe449ca95ba7..2d8f77d71fef 100644 --- 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 index 521726430afa..95b0f7db3c69 100644 --- 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 }