git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6
[pandora-kernel.git]
/
include
/
asm-generic
/
cputime.h
diff --git
a/include/asm-generic/cputime.h
b/include/asm-generic/cputime.h
index
62ce682
..
12a1764
100644
(file)
--- 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 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.
/*
* Convert cputime to seconds and back.