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

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

diff --git a/include/asm-generic/cputime.h b/include/asm-generic/cputime.h
index 6f17856..1c1fa42 100644 (file)
--- a/include/asm-generic/cputime.h
+++ b/include/asm-generic/cputime.h
@@ -18,13 +18,16 @@ typedef unsigned long cputime_t;
 #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)