06b8e878a9
This moves the ability to scale cputime into generic code. This allows us to fix the issue in kernel/timer.c (noticed by Balbir) where we could only add an unscaled value to the scaled utime/stime. This adds a cputime_to_scaled function. As before, the POWERPC version does the scaling based on the last SPURR/PURR ratio calculated. The generic and s390 (only other arch to implement asm/cputime.h) versions are both NOPs. Also moves the SPURR and PURR snapshots closer. Signed-off-by: Michael Neuling <mikey@neuling.org> Cc: Jay Lan <jlan@engr.sgi.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
69 lines
1.9 KiB
C
69 lines
1.9 KiB
C
#ifndef _ASM_GENERIC_CPUTIME_H
|
|
#define _ASM_GENERIC_CPUTIME_H
|
|
|
|
#include <linux/time.h>
|
|
#include <linux/jiffies.h>
|
|
|
|
typedef unsigned long cputime_t;
|
|
|
|
#define cputime_zero (0UL)
|
|
#define cputime_max ((~0UL >> 1) - 1)
|
|
#define cputime_add(__a, __b) ((__a) + (__b))
|
|
#define cputime_sub(__a, __b) ((__a) - (__b))
|
|
#define cputime_div(__a, __n) ((__a) / (__n))
|
|
#define cputime_halve(__a) ((__a) >> 1)
|
|
#define cputime_eq(__a, __b) ((__a) == (__b))
|
|
#define cputime_gt(__a, __b) ((__a) > (__b))
|
|
#define cputime_ge(__a, __b) ((__a) >= (__b))
|
|
#define cputime_lt(__a, __b) ((__a) < (__b))
|
|
#define cputime_le(__a, __b) ((__a) <= (__b))
|
|
#define cputime_to_jiffies(__ct) (__ct)
|
|
#define cputime_to_scaled(__ct) (__ct)
|
|
#define jiffies_to_cputime(__hz) (__hz)
|
|
|
|
typedef u64 cputime64_t;
|
|
|
|
#define cputime64_zero (0ULL)
|
|
#define cputime64_add(__a, __b) ((__a) + (__b))
|
|
#define cputime64_sub(__a, __b) ((__a) - (__b))
|
|
#define cputime64_to_jiffies64(__ct) (__ct)
|
|
#define jiffies64_to_cputime64(__jif) (__jif)
|
|
#define cputime_to_cputime64(__ct) ((u64) __ct)
|
|
|
|
|
|
/*
|
|
* Convert cputime to milliseconds and back.
|
|
*/
|
|
#define cputime_to_msecs(__ct) jiffies_to_msecs(__ct)
|
|
#define msecs_to_cputime(__msecs) msecs_to_jiffies(__msecs)
|
|
|
|
/*
|
|
* Convert cputime to seconds and back.
|
|
*/
|
|
#define cputime_to_secs(jif) ((jif) / HZ)
|
|
#define secs_to_cputime(sec) ((sec) * HZ)
|
|
|
|
/*
|
|
* Convert cputime to timespec and back.
|
|
*/
|
|
#define timespec_to_cputime(__val) timespec_to_jiffies(__val)
|
|
#define cputime_to_timespec(__ct,__val) jiffies_to_timespec(__ct,__val)
|
|
|
|
/*
|
|
* Convert cputime to timeval and back.
|
|
*/
|
|
#define timeval_to_cputime(__val) timeval_to_jiffies(__val)
|
|
#define cputime_to_timeval(__ct,__val) jiffies_to_timeval(__ct,__val)
|
|
|
|
/*
|
|
* Convert cputime to clock and back.
|
|
*/
|
|
#define cputime_to_clock_t(__ct) jiffies_to_clock_t(__ct)
|
|
#define clock_t_to_cputime(__x) clock_t_to_jiffies(__x)
|
|
|
|
/*
|
|
* Convert cputime64 to clock.
|
|
*/
|
|
#define cputime64_to_clock_t(__ct) jiffies_64_to_clock_t(__ct)
|
|
|
|
#endif
|