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 /arch/ia64 | |
| parent | 8ade06c616b34b4237c0ed77d1ff0ce04ad7d056 (diff) | |
| parent | 89307babf966165171547f105e2253dec261cfa5 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/include/asm/cputime.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/include/asm/cputime.h b/arch/ia64/include/asm/cputime.h index 6073b187528a..5a274af31b2b 100644 --- a/arch/ia64/include/asm/cputime.h +++ b/arch/ia64/include/asm/cputime.h | |||
| @@ -60,6 +60,7 @@ typedef u64 cputime64_t; | |||
| 60 | */ | 60 | */ |
| 61 | #define cputime_to_usecs(__ct) ((__ct) / NSEC_PER_USEC) | 61 | #define cputime_to_usecs(__ct) ((__ct) / NSEC_PER_USEC) |
| 62 | #define usecs_to_cputime(__usecs) ((__usecs) * NSEC_PER_USEC) | 62 | #define usecs_to_cputime(__usecs) ((__usecs) * NSEC_PER_USEC) |
| 63 | #define usecs_to_cputime64(__usecs) usecs_to_cputime(__usecs) | ||
| 63 | 64 | ||
| 64 | /* | 65 | /* |
| 65 | * Convert cputime <-> seconds | 66 | * Convert cputime <-> seconds |