diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-15 01:33:11 -0500 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-15 01:33:11 -0500 |
commit | 1bb95834bbcdc969e477a9284cf96c17a4c2616f (patch) | |
tree | 9cf66b22a611bb6bc78778c05dac72263bb45a23 /include/asm-generic/cputime.h | |
parent | 85345517fe6d4de27b0d6ca19fef9d28ac947c4a (diff) | |
parent | a41c73e04673b47730df682446f0d52f95e32a5b (diff) |
Merge remote branch 'airlied/drm-fixes' into drm-intel-fixes
Diffstat (limited to 'include/asm-generic/cputime.h')
-rw-r--r-- | include/asm-generic/cputime.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-generic/cputime.h b/include/asm-generic/cputime.h index ca0f239f0e13..2bcc5c7c22a6 100644 --- a/include/asm-generic/cputime.h +++ b/include/asm-generic/cputime.h | |||
@@ -33,10 +33,10 @@ typedef u64 cputime64_t; | |||
33 | 33 | ||
34 | 34 | ||
35 | /* | 35 | /* |
36 | * Convert cputime to milliseconds and back. | 36 | * Convert cputime to microseconds and back. |
37 | */ | 37 | */ |
38 | #define cputime_to_msecs(__ct) jiffies_to_msecs(__ct) | 38 | #define cputime_to_usecs(__ct) jiffies_to_usecs(__ct); |
39 | #define msecs_to_cputime(__msecs) msecs_to_jiffies(__msecs) | 39 | #define usecs_to_cputime(__msecs) usecs_to_jiffies(__msecs); |
40 | 40 | ||
41 | /* | 41 | /* |
42 | * Convert cputime to seconds and back. | 42 | * Convert cputime to seconds and back. |