Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755248AbdCGKFp (ORCPT ); Tue, 7 Mar 2017 05:05:45 -0500 Received: from mail-lf0-f65.google.com ([209.85.215.65]:36453 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755151AbdCGKFB (ORCPT ); Tue, 7 Mar 2017 05:05:01 -0500 From: Frederic Weisbecker To: Thomas Gleixner Cc: LKML , Frederic Weisbecker , Ingo Molnar , Peter Zijlstra , Meelis Roos Subject: [PATCH] jiffies: Revert mistaken conversion of NSEC_PER_SEC to TICK_NSEC Date: Tue, 7 Mar 2017 10:55:34 +0100 Message-Id: <1488880534-3777-1-git-send-email-fweisbec@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1139 Lines: 34 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 Cc: Meelis Roos Cc: Thomas Gleixner Cc: Peter Zijlstra Cc: Ingo Molnar Signed-off-by: Frederic Weisbecker --- 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