347abad981
On 32 bit systems cmpxchg cannot handle 64 bit values, so some additional magic is required to allow a 32 bit system with CONFIG_VIRT_CPU_ACCOUNTING_GEN=y enabled to build. Make sure the correct cmpxchg function is used when doing an atomic swap of a cputime_t. Reported-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Rik van Riel <riel@redhat.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: umgwanakikbuti@gmail.com Cc: fweisbec@gmail.com Cc: srao@redhat.com Cc: lwoodman@redhat.com Cc: atheurer@redhat.com Cc: oleg@redhat.com Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Paul Mackerras <paulus@samba.org> Cc: linux390@de.ibm.com Cc: linux-arch@vger.kernel.org Cc: linuxppc-dev@lists.ozlabs.org Cc: linux-s390@vger.kernel.org Link: http://lkml.kernel.org/r/20140930155947.070cdb1f@annuminas.surriel.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
77 lines
2.1 KiB
C
77 lines
2.1 KiB
C
#ifndef _ASM_GENERIC_CPUTIME_JIFFIES_H
|
|
#define _ASM_GENERIC_CPUTIME_JIFFIES_H
|
|
|
|
typedef unsigned long __nocast cputime_t;
|
|
|
|
#define cmpxchg_cputime(ptr, old, new) cmpxchg(ptr, old, new)
|
|
|
|
#define cputime_one_jiffy jiffies_to_cputime(1)
|
|
#define cputime_to_jiffies(__ct) (__force unsigned long)(__ct)
|
|
#define cputime_to_scaled(__ct) (__ct)
|
|
#define jiffies_to_cputime(__hz) (__force cputime_t)(__hz)
|
|
|
|
typedef u64 __nocast cputime64_t;
|
|
|
|
#define cputime64_to_jiffies64(__ct) (__force u64)(__ct)
|
|
#define jiffies64_to_cputime64(__jif) (__force cputime64_t)(__jif)
|
|
|
|
|
|
/*
|
|
* Convert nanoseconds <-> cputime
|
|
*/
|
|
#define cputime_to_nsecs(__ct) \
|
|
jiffies_to_nsecs(cputime_to_jiffies(__ct))
|
|
#define nsecs_to_cputime64(__nsec) \
|
|
jiffies64_to_cputime64(nsecs_to_jiffies64(__nsec))
|
|
#define nsecs_to_cputime(__nsec) \
|
|
jiffies_to_cputime(nsecs_to_jiffies(__nsec))
|
|
|
|
|
|
/*
|
|
* Convert cputime to microseconds and back.
|
|
*/
|
|
#define cputime_to_usecs(__ct) \
|
|
jiffies_to_usecs(cputime_to_jiffies(__ct))
|
|
#define usecs_to_cputime(__usec) \
|
|
jiffies_to_cputime(usecs_to_jiffies(__usec))
|
|
#define usecs_to_cputime64(__usec) \
|
|
jiffies64_to_cputime64(nsecs_to_jiffies64((__usec) * 1000))
|
|
|
|
/*
|
|
* Convert cputime to seconds and back.
|
|
*/
|
|
#define cputime_to_secs(jif) (cputime_to_jiffies(jif) / HZ)
|
|
#define secs_to_cputime(sec) jiffies_to_cputime((sec) * HZ)
|
|
|
|
/*
|
|
* Convert cputime to timespec and back.
|
|
*/
|
|
#define timespec_to_cputime(__val) \
|
|
jiffies_to_cputime(timespec_to_jiffies(__val))
|
|
#define cputime_to_timespec(__ct,__val) \
|
|
jiffies_to_timespec(cputime_to_jiffies(__ct),__val)
|
|
|
|
/*
|
|
* Convert cputime to timeval and back.
|
|
*/
|
|
#define timeval_to_cputime(__val) \
|
|
jiffies_to_cputime(timeval_to_jiffies(__val))
|
|
#define cputime_to_timeval(__ct,__val) \
|
|
jiffies_to_timeval(cputime_to_jiffies(__ct),__val)
|
|
|
|
/*
|
|
* Convert cputime to clock and back.
|
|
*/
|
|
#define cputime_to_clock_t(__ct) \
|
|
jiffies_to_clock_t(cputime_to_jiffies(__ct))
|
|
#define clock_t_to_cputime(__x) \
|
|
jiffies_to_cputime(clock_t_to_jiffies(__x))
|
|
|
|
/*
|
|
* Convert cputime64 to clock.
|
|
*/
|
|
#define cputime64_to_clock_t(__ct) \
|
|
jiffies_64_to_clock_t(cputime64_to_jiffies64(__ct))
|
|
|
|
#endif
|