diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-01-09 16:06:31 +0000 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-09 16:06:31 +0000 |
commit | b48741cce3be32a48af9a2b272f3f13a077375cf (patch) | |
tree | e4bc91713e02fa6d8f08b07de53ea8f905593dfa /include/asm-generic/cputime.h | |
parent | 54b6c82ac9a124804816f244f587c0f40d25ad01 (diff) | |
parent | a07613a54d700a974f3a4a657da78ef5d097315d (diff) |
Merge branch 'samsung/cleanup' into next/cleanup2
Diffstat (limited to 'include/asm-generic/cputime.h')
-rw-r--r-- | include/asm-generic/cputime.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-generic/cputime.h b/include/asm-generic/cputime.h index 62ce6823c0f2..12a1764f612b 100644 --- a/include/asm-generic/cputime.h +++ b/include/asm-generic/cputime.h @@ -40,6 +40,7 @@ typedef u64 cputime64_t; */ #define cputime_to_usecs(__ct) jiffies_to_usecs(__ct) #define usecs_to_cputime(__msecs) usecs_to_jiffies(__msecs) +#define usecs_to_cputime64(__msecs) nsecs_to_jiffies64((__msecs) * 1000) /* * Convert cputime to seconds and back. |