diff options
| author | Ingo Molnar <mingo@elte.hu> | 2012-01-17 03:51:46 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2012-01-17 03:51:46 -0500 |
| commit | 6eadf1075c6f923fece419e38cf05bff559aefcd (patch) | |
| tree | b743ce0a3743d6f1b915b19b077a6d5bad980ea1 /arch/ia64/include | |
| parent | a1c611745c8c4e8996c1877d4e5d0fc95f227c38 (diff) | |
| parent | c10076c4304083af15a41f6bc5e657e781c1f9a6 (diff) | |
Merge branch 'tip/perf/urgent-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/urgent
Diffstat (limited to 'arch/ia64/include')
| -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 |