diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-08-29 04:34:18 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-08-29 04:34:29 -0400 |
| commit | f71bb0ac5e85410601b0db29d7b1635345ea61a4 (patch) | |
| tree | 7c3ef70ef008db87d8b71e5de0632766ecd64d2f /arch/s390 | |
| parent | 7285dd7fd375763bfb8ab1ac9cf3f1206f503c16 (diff) | |
| parent | a42548a18866e87092db93b771e6c5b060d78401 (diff) | |
Merge branch 'timers/posixtimers' into timers/tracing
Merge reason: timer tracepoint patches depend on both branches
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/include/asm/cputime.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/include/asm/cputime.h b/arch/s390/include/asm/cputime.h index 7a3817a656df..24b1244aadb9 100644 --- a/arch/s390/include/asm/cputime.h +++ b/arch/s390/include/asm/cputime.h | |||
| @@ -42,6 +42,7 @@ __div(unsigned long long n, unsigned int base) | |||
| 42 | #endif /* __s390x__ */ | 42 | #endif /* __s390x__ */ |
| 43 | 43 | ||
| 44 | #define cputime_zero (0ULL) | 44 | #define cputime_zero (0ULL) |
| 45 | #define cputime_one_jiffy jiffies_to_cputime(1) | ||
| 45 | #define cputime_max ((~0UL >> 1) - 1) | 46 | #define cputime_max ((~0UL >> 1) - 1) |
| 46 | #define cputime_add(__a, __b) ((__a) + (__b)) | 47 | #define cputime_add(__a, __b) ((__a) + (__b)) |
| 47 | #define cputime_sub(__a, __b) ((__a) - (__b)) | 48 | #define cputime_sub(__a, __b) ((__a) - (__b)) |