Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c23b80e authored by Kevin Hilman's avatar Kevin Hilman Committed by Frederic Weisbecker
Browse files

cputime_nsecs: use math64.h for nsec resolution conversion helpers 



For the nsec resolution conversions to be useable on non 64-bit
architectures, the helpers in <linux/math64.h> need to be used so the
right arch-specific 64-bit math helpers can be used (e.g. do_div())

Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
Cc: Christoph Lameter <cl@linux.com>
Cc: Hakan Akkan <hakanakkan@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Kevin Hilman <khilman@linaro.org>
Cc: Li Zhong <zhong@linux.vnet.ibm.com>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
parent c58b0df1

include/asm-generic/cputime_nsecs.h

+19 −9
Original line number Diff line number Diff line
@@ -16,21 +16,27 @@ 
#ifndef _ASM_GENERIC_CPUTIME_NSECS_H

#define _ASM_GENERIC_CPUTIME_NSECS_H



#include <linux/math64.h>



typedef u64 __nocast cputime_t;

typedef u64 __nocast cputime64_t;



#define cputime_one_jiffy		jiffies_to_cputime(1)



#define cputime_div(__ct, divisor)  div_u64((__force u64)__ct, divisor)

#define cputime_div_rem(__ct, divisor, remainder) \

	div_u64_rem((__force u64)__ct, divisor, remainder);



/*

 * Convert cputime <-> jiffies (HZ)

 */

#define cputime_to_jiffies(__ct)	\

	((__force u64)(__ct) / (NSEC_PER_SEC / HZ))

	cputime_div(__ct, NSEC_PER_SEC / HZ)

#define cputime_to_scaled(__ct)		(__ct)

#define jiffies_to_cputime(__jif)	\

	(__force cputime_t)((__jif) * (NSEC_PER_SEC / HZ))

#define cputime64_to_jiffies64(__ct)	\

	((__force u64)(__ct) / (NSEC_PER_SEC / HZ))

	cputime_div(__ct, NSEC_PER_SEC / HZ)

#define jiffies64_to_cputime64(__jif)	\

	(__force cputime64_t)((__jif) * (NSEC_PER_SEC / HZ))
@@ -45,7 +51,7 @@ typedef u64 __nocast cputime64_t; 
 * Convert cputime <-> microseconds

 */

#define cputime_to_usecs(__ct)		\

	((__force u64)(__ct) / NSEC_PER_USEC)

	cputime_div(__ct, NSEC_PER_USEC)

#define usecs_to_cputime(__usecs)	\

	(__force cputime_t)((__usecs) * NSEC_PER_USEC)

#define usecs_to_cputime64(__usecs)	\
@@ -55,7 +61,7 @@ typedef u64 __nocast cputime64_t; 
 * Convert cputime <-> seconds

 */

#define cputime_to_secs(__ct)		\

	((__force u64)(__ct) / NSEC_PER_SEC)

	cputime_div(__ct, NSEC_PER_SEC)

#define secs_to_cputime(__secs)		\

	(__force cputime_t)((__secs) * NSEC_PER_SEC)
@@ -69,8 +75,10 @@ static inline cputime_t timespec_to_cputime(const struct timespec *val) 
}

static inline void cputime_to_timespec(const cputime_t ct, struct timespec *val)

{

	val->tv_sec  = (__force u64) ct / NSEC_PER_SEC;

	val->tv_nsec = (__force u64) ct % NSEC_PER_SEC;

	u32 rem;



	val->tv_sec = cputime_div_rem(ct, NSEC_PER_SEC, &rem);

	val->tv_nsec = rem;

}



/*
@@ -83,15 +91,17 @@ static inline cputime_t timeval_to_cputime(const struct timeval *val) 
}

static inline void cputime_to_timeval(const cputime_t ct, struct timeval *val)

{

	val->tv_sec = (__force u64) ct / NSEC_PER_SEC;

	val->tv_usec = ((__force u64) ct % NSEC_PER_SEC) / NSEC_PER_USEC;

	u32 rem;



	val->tv_sec = cputime_div_rem(ct, NSEC_PER_SEC, &rem);

	val->tv_usec = rem / NSEC_PER_USEC;

}



/*

 * Convert cputime <-> clock (USER_HZ)

 */

#define cputime_to_clock_t(__ct)	\

	((__force u64)(__ct) / (NSEC_PER_SEC / USER_HZ))

	cputime_div(__ct, (NSEC_PER_SEC / USER_HZ))

#define clock_t_to_cputime(__x)		\

	(__force cputime_t)((__x) * (NSEC_PER_SEC / USER_HZ))