diff options
| author | David S. Miller <davem@davemloft.net> | 2011-12-30 13:04:14 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-12-30 13:04:14 -0500 |
| commit | 7f8e3234c5f7fbdb06be050c8a1907e9c36d7c61 (patch) | |
| tree | d6e9edb2087fa4a97b2cc3d585a0189672a14cf4 /include/asm-generic | |
| parent | 8ade06c616b34b4237c0ed77d1ff0ce04ad7d056 (diff) | |
| parent | 89307babf966165171547f105e2253dec261cfa5 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'include/asm-generic')
| -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; | |||
| 40 | */ | 40 | */ |
| 41 | #define cputime_to_usecs(__ct) jiffies_to_usecs(__ct) | 41 | #define cputime_to_usecs(__ct) jiffies_to_usecs(__ct) |
| 42 | #define usecs_to_cputime(__msecs) usecs_to_jiffies(__msecs) | 42 | #define usecs_to_cputime(__msecs) usecs_to_jiffies(__msecs) |
| 43 | #define usecs_to_cputime64(__msecs) nsecs_to_jiffies64((__msecs) * 1000) | ||
| 43 | 44 | ||
| 44 | /* | 45 | /* |
| 45 | * Convert cputime to seconds and back. | 46 | * Convert cputime to seconds and back. |