The following commit: 93825f2ec736f30e034ab7c9d56b42849c5b00da ("jiffies: Reuse TICK_NSEC instead of NSEC_PER_JIFFY")
has introduced a wrong rename due to a confusion between NSEC_PER_JIFFY and NSEC_PER_SEC. As a result, the calculation of refined jiffies got broken, triggering lockups. Reported-and-tested-by: Meelis Roos <mr...@linux.ee> Cc: Meelis Roos <mr...@linux.ee> Cc: Thomas Gleixner <t...@linutronix.de> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Ingo Molnar <mi...@kernel.org> Signed-off-by: Frederic Weisbecker <fweis...@gmail.com> --- kernel/time/jiffies.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/time/jiffies.c b/kernel/time/jiffies.c index 7906b3f..4977191 100644 --- a/kernel/time/jiffies.c +++ b/kernel/time/jiffies.c @@ -125,7 +125,7 @@ int register_refined_jiffies(long cycles_per_second) shift_hz += cycles_per_tick/2; do_div(shift_hz, cycles_per_tick); /* Calculate nsec_per_tick using shift_hz */ - nsec_per_tick = (u64)TICK_NSEC << 8; + nsec_per_tick = (u64)NSEC_PER_SEC << 8; nsec_per_tick += (u32)shift_hz/2; do_div(nsec_per_tick, (u32)shift_hz); -- 2.7.4