diff options
| author | John Stultz <john.stultz@linaro.org> | 2012-09-28 18:00:27 -0400 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2012-09-28 18:00:27 -0400 |
| commit | 28f2b02bc581ffc835bc1691b18d03f62fcf0395 (patch) | |
| tree | 94205c22ecc0c1d0a792f610cfd7e63967227ea8 /include/linux/jiffies.h | |
| parent | 650ea02475106e8d6bdf561896d2ffe0d1c0ebb4 (diff) | |
| parent | 015a830d44695adff8b52d2703608cec4a1041ba (diff) | |
Merge branch 'arnds-jiffies-fix' into fortglx/3.7/time
Sort out conflict with Arnd's patch that preserves
the unconditional LATCH value.
Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'include/linux/jiffies.h')
| -rw-r--r-- | include/linux/jiffies.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h index 388edb54bfb6..c6d5b2afdc96 100644 --- a/include/linux/jiffies.h +++ b/include/linux/jiffies.h | |||
| @@ -51,6 +51,9 @@ | |||
| 51 | #define SH_DIV(NOM,DEN,LSH) ( (((NOM) / (DEN)) << (LSH)) \ | 51 | #define SH_DIV(NOM,DEN,LSH) ( (((NOM) / (DEN)) << (LSH)) \ |
| 52 | + ((((NOM) % (DEN)) << (LSH)) + (DEN) / 2) / (DEN)) | 52 | + ((((NOM) % (DEN)) << (LSH)) + (DEN) / 2) / (DEN)) |
| 53 | 53 | ||
| 54 | /* LATCH is used in the interval timer and ftape setup. */ | ||
| 55 | #define LATCH ((CLOCK_TICK_RATE + HZ/2) / HZ) /* For divider */ | ||
| 56 | |||
| 54 | extern int register_refined_jiffies(long clock_tick_rate); | 57 | extern int register_refined_jiffies(long clock_tick_rate); |
| 55 | 58 | ||
| 56 | /* TICK_NSEC is the time between ticks in nsec assuming SHIFTED_HZ */ | 59 | /* TICK_NSEC is the time between ticks in nsec assuming SHIFTED_HZ */ |