summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2012-09-28 18:00:27 -0400
committerJohn Stultz <john.stultz@linaro.org>2012-09-28 18:00:27 -0400
commit28f2b02bc581ffc835bc1691b18d03f62fcf0395 (patch)
tree94205c22ecc0c1d0a792f610cfd7e63967227ea8
parent650ea02475106e8d6bdf561896d2ffe0d1c0ebb4 (diff)
parent015a830d44695adff8b52d2703608cec4a1041ba (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>
-rw-r--r--include/linux/jiffies.h3
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 @@
#define SH_DIV(NOM,DEN,LSH) ( (((NOM) / (DEN)) << (LSH)) \
+ ((((NOM) % (DEN)) << (LSH)) + (DEN) / 2) / (DEN))
+/* LATCH is used in the interval timer and ftape setup. */
+#define LATCH ((CLOCK_TICK_RATE + HZ/2) / HZ) /* For divider */
+
extern int register_refined_jiffies(long clock_tick_rate);
/* TICK_NSEC is the time between ticks in nsec assuming SHIFTED_HZ */