Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / include / asm-generic / cputime.h

diff --git a/include/asm-generic/cputime.h b/include/asm-generic/cputime.h
index 77202e2..9a62937 100644 (file)
--- a/include/asm-generic/cputime.h
+++ b/include/asm-generic/cputime.h
@@ -24,9 +24,11 @@ typedef u64 __nocast cputime64_t;
  * Convert cputime to microseconds and back.
  */
 #define cputime_to_usecs(__ct)         \
-       jiffies_to_usecs(cputime_to_jiffies(__ct));
-#define usecs_to_cputime(__msecs)      \
-       jiffies_to_cputime(usecs_to_jiffies(__msecs));
+       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.