As suggested by Thomas Gleixner, the second patch now integrates a fix in case the sanity check fails and the clockevent isn't programmed as expected.
Frederic Weisbecker (2): nohz: Fix again collision between tick and other hrtimers tick: Make sure tick timer is active when bypassing reprogramming kernel/time/tick-sched.c | 33 ++++++++++++++++++++++++++++++--- kernel/time/tick-sched.h | 2 ++ 2 files changed, 32 insertions(+), 3 deletions(-) -- 2.7.4