lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 20 Dec 2011 16:11:13 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Martin Schwidefsky <schwidefsky@...ibm.com>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Andreas Schwab <schwab@...ux-m68k.org>,
Benjamin Herrenschmidt <benh@...nel.crashing.org>,
Paul Mackerras <paulus@...ba.org>,
<linuxppc-dev@...ts.ozlabs.org>
Subject: linux-next: manual merge of the cputime tree with the powerpc tree
Hi Martin,
Today's linux-next merge of the cputime tree got a conflict in
arch/powerpc/include/asm/cputime.h between commit 9f5072d4f63f ("powerpc:
Fix wrong divisor in usecs_to_cputime") from the powerpc tree and commit
648616343cdb ("[S390] cputime: add sparse checking and cleanup") from the
cputime tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
diff --cc arch/powerpc/include/asm/cputime.h
index 33a3580,e94935c..0000000
--- a/arch/powerpc/include/asm/cputime.h
+++ b/arch/powerpc/include/asm/cputime.h
@@@ -130,7 -114,7 +114,7 @@@ extern u64 __cputime_usec_factor
static inline unsigned long cputime_to_usecs(const cputime_t ct)
{
- return mulhdu(ct, __cputime_usec_factor);
- return mulhdu((__force u64) ct, __cputime_msec_factor) * USEC_PER_MSEC;
++ return mulhdu((__force u64) ct, __cputime_usec_factor);
}
static inline cputime_t usecs_to_cputime(const unsigned long us)
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists