diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-23 12:46:15 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-23 12:46:15 -0400 |
| commit | 31bbb9b58d1e8ebcf2b28c95c2250a9f8e31e397 (patch) | |
| tree | 6bb0c0490d66d32eca43e73abb28d8b3ab0e7b91 /arch/ia64 | |
| parent | ff830b8e5f999d1ccbd0282a666520f0b557daa4 (diff) | |
| parent | 3f0a525ebf4b8ef041a332bbe4a73aee94bb064b (diff) | |
Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
itimers: Add tracepoints for itimer
hrtimer: Add tracepoint for hrtimers
timers: Add tracepoints for timer_list timers
cputime: Optimize jiffies_to_cputime(1)
itimers: Simplify arm_timer() code a bit
itimers: Fix periodic tics precision
itimers: Merge ITIMER_VIRT and ITIMER_PROF
Trivial header file include conflicts in kernel/fork.c
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 d20b998cb91d..7fa8a8594660 100644 --- a/arch/ia64/include/asm/cputime.h +++ b/arch/ia64/include/asm/cputime.h | |||
| @@ -30,6 +30,7 @@ typedef u64 cputime_t; | |||
| 30 | typedef u64 cputime64_t; | 30 | typedef u64 cputime64_t; |
| 31 | 31 | ||
| 32 | #define cputime_zero ((cputime_t)0) | 32 | #define cputime_zero ((cputime_t)0) |
| 33 | #define cputime_one_jiffy jiffies_to_cputime(1) | ||
| 33 | #define cputime_max ((~((cputime_t)0) >> 1) - 1) | 34 | #define cputime_max ((~((cputime_t)0) >> 1) - 1) |
| 34 | #define cputime_add(__a, __b) ((__a) + (__b)) | 35 | #define cputime_add(__a, __b) ((__a) + (__b)) |
| 35 | #define cputime_sub(__a, __b) ((__a) - (__b)) | 36 | #define cputime_sub(__a, __b) ((__a) - (__b)) |