From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 769EF1F2381; Thu, 12 Dec 2024 17:16:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734023770; cv=none; b=DftWpTj9RCzMhKRg67YNciZz48nJ+QzaJAYMghlgMxnOaQeBX4OkOR2ZMTSCTF1DL50wI0JfLtdU2QgSVDWGoRuUC2O2Y1rMm/H0D5TDcmJ7hTNq75V59+pX+wyGe3B7R31c8zUP/5kZsWIodh88GcminJAXdH/JW3L8REZguqA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734023770; c=relaxed/simple; bh=uKQjgVdZ5jgSYRMu4HK3KXVc2NvNERqHNhi8zPeEJQ0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nEs6jQrjfMA/KnSknh33uFKCvHC4AH34T2a9Hr1slYJBDSkKMo397EdmYFpM5wUf+4RK6lrp2w3GKaTuBSB98YA7tIxlO5XYEzqouwu312Iv1c43UfSIcwYnQhJImD96VFZp1xyaX9alOSkuM5RErvYNkK2lVn/W9rtpSKdBoVw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=WjdT+3gU; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="WjdT+3gU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DF70EC4CECE; Thu, 12 Dec 2024 17:16:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1734023770; bh=uKQjgVdZ5jgSYRMu4HK3KXVc2NvNERqHNhi8zPeEJQ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WjdT+3gUCskPuaUe23WJFKJWOMn9Q87Bb3zfICz9N/SvfogoVPTDo2Bnnxy2bz0oc 4O/66iZP/GoXzXK/ogJju7fWozk3/S9MLdkhZwTMDd9sfj7iTl+hLXBcaMqOkSvNv1 MjJUlXH4IC6Qwuw19DSFTVGbnfB5ARKeFZFsQOng= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Miguel Ojeda , Thomas Gleixner , Sasha Levin Subject: [PATCH 5.10 076/459] time: Fix references to _msecs_to_jiffies() handling of values Date: Thu, 12 Dec 2024 15:56:54 +0100 Message-ID: <20241212144256.523635322@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241212144253.511169641@linuxfoundation.org> References: <20241212144253.511169641@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Miguel Ojeda [ Upstream commit 92b043fd995a63a57aae29ff85a39b6f30cd440c ] The details about the handling of the "normal" values were moved to the _msecs_to_jiffies() helpers in commit ca42aaf0c861 ("time: Refactor msecs_to_jiffies"). However, the same commit still mentioned __msecs_to_jiffies() in the added documentation. Thus point to _msecs_to_jiffies() instead. Fixes: ca42aaf0c861 ("time: Refactor msecs_to_jiffies") Signed-off-by: Miguel Ojeda Signed-off-by: Thomas Gleixner Link: https://lore.kernel.org/all/20241025110141.157205-2-ojeda@kernel.org Signed-off-by: Sasha Levin --- include/linux/jiffies.h | 2 +- kernel/time/time.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h index 5e13f801c9021..3778e26f7b14c 100644 --- a/include/linux/jiffies.h +++ b/include/linux/jiffies.h @@ -349,7 +349,7 @@ static inline unsigned long _msecs_to_jiffies(const unsigned int m) * - all other values are converted to jiffies by either multiplying * the input value by a factor or dividing it with a factor and * handling any 32-bit overflows. - * for the details see __msecs_to_jiffies() + * for the details see _msecs_to_jiffies() * * msecs_to_jiffies() checks for the passed in value being a constant * via __builtin_constant_p() allowing gcc to eliminate most of the diff --git a/kernel/time/time.c b/kernel/time/time.c index 3985b2b32d083..483f8a3e24d0c 100644 --- a/kernel/time/time.c +++ b/kernel/time/time.c @@ -539,7 +539,7 @@ EXPORT_SYMBOL(ns_to_timespec64); * - all other values are converted to jiffies by either multiplying * the input value by a factor or dividing it with a factor and * handling any 32-bit overflows. - * for the details see __msecs_to_jiffies() + * for the details see _msecs_to_jiffies() * * msecs_to_jiffies() checks for the passed in value being a constant * via __builtin_constant_p() allowing gcc to eliminate most of the -- 2.43.0