---

yaml --- r: 350135 b: refs/heads/master c: ae8dda5 h: refs/heads/master i: 350133: 370bdea 350131: bbffc23 350127: 4f15255 v: v3
git-mirror · Jan 27, 2013 · fc0c469 · fc0c469
1 parent 85a97f0
commit fc0c469
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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;