From fc0c46953713ba14ac97589cacf06e40d84a32e7 Mon Sep 17 00:00:00 2001 From: Frederic Weisbecker Date: Wed, 16 Jan 2013 18:02:04 +0100 Subject: [PATCH] --- yaml --- r: 350135 b: refs/heads/master c: ae8dda5c473bf1a85913942adcaac449e5754bf3 h: refs/heads/master i: 350133: 370bdea071b2c4d3f79525ec555ff7c31044d3a8 350131: bbffc2351a00b96c659cc4883c093fc1836347a8 350127: 4f15255b18867c395e958516d614f755e0b68a3b v: v3 --- [refs] | 2 +- trunk/include/asm-generic/cputime_jiffies.h | 10 ++++++++-- trunk/kernel/sched/cputime.c | 4 ---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index cbd337fcca84..e12ef6d93183 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 39613766e8826756a4bf8c74274eb971c3c1d929 +refs/heads/master: ae8dda5c473bf1a85913942adcaac449e5754bf3 diff --git a/trunk/include/asm-generic/cputime_jiffies.h b/trunk/include/asm-generic/cputime_jiffies.h index b747f1fac2d2..272ecba9f588 100644 --- a/trunk/include/asm-generic/cputime_jiffies.h +++ b/trunk/include/asm-generic/cputime_jiffies.h @@ -13,8 +13,14 @@ typedef u64 __nocast cputime64_t; #define cputime64_to_jiffies64(__ct) (__force u64)(__ct) #define jiffies64_to_cputime64(__jif) (__force cputime64_t)(__jif) -#define nsecs_to_cputime64(__ct) \ - jiffies64_to_cputime64(nsecs_to_jiffies64(__ct)) + +/* + * Convert nanoseconds to cputime + */ +#define nsecs_to_cputime64(__nsec) \ + jiffies64_to_cputime64(nsecs_to_jiffies64(__nsec)) +#define nsecs_to_cputime(__nsec) \ + jiffies_to_cputime(nsecs_to_jiffies(__nsec)) /* diff --git a/trunk/kernel/sched/cputime.c b/trunk/kernel/sched/cputime.c index 293b202fcf79..5849448b981e 100644 --- a/trunk/kernel/sched/cputime.c +++ b/trunk/kernel/sched/cputime.c @@ -505,10 +505,6 @@ EXPORT_SYMBOL_GPL(vtime_account); #else -#ifndef nsecs_to_cputime -# define nsecs_to_cputime(__nsecs) nsecs_to_jiffies(__nsecs) -#endif - static cputime_t scale_utime(cputime_t utime, cputime_t rtime, cputime_t total) { u64 temp = (__force u64) rtime;