Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28f2b02b authored by John Stultz's avatar John Stultz
Browse files

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: default avatarJohn Stultz <john.stultz@linaro.org>
parents 650ea024 015a830d

include/linux/jiffies.h

+3 −0
Original line number Diff line number Diff line
@@ -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 */