From patchwork Fri Nov 15 21:22:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Easwar Hariharan X-Patchwork-Id: 13876904 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id F06DED68BD8 for ; Fri, 15 Nov 2024 21:22:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 099826B0092; Fri, 15 Nov 2024 16:22:48 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id F408A6B0093; Fri, 15 Nov 2024 16:22:47 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CF4A46B0095; Fri, 15 Nov 2024 16:22:47 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id B0C816B0092 for ; Fri, 15 Nov 2024 16:22:47 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 74E8F120422 for ; Fri, 15 Nov 2024 21:22:47 +0000 (UTC) X-FDA: 82789602630.22.AB2C26D Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by imf21.hostedemail.com (Postfix) with ESMTP id CC5961C000E for ; Fri, 15 Nov 2024 21:21:18 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=linux.microsoft.com header.s=default header.b=jwtdE59v; dmarc=pass (policy=none) header.from=linux.microsoft.com; spf=pass (imf21.hostedemail.com: domain of eahariha@linux.microsoft.com designates 13.77.154.182 as permitted sender) smtp.mailfrom=eahariha@linux.microsoft.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1731705701; a=rsa-sha256; cv=none; b=wFK7yv+9IQi/rCxzk3YxD5vYq9hkZc8A/36+1trYG+Lk82M+DKbxUCjRe1cYvTZHT3RZrU 7JeXbzsSXauKHo7YeDL8FS3r1Xr4KPx02APjHZOOs+rk77tOqvAmcev4ZpJrSisx7Q0OQl 43m76bqD5C5xf1WQQLp5809Qi99LWRM= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=linux.microsoft.com header.s=default header.b=jwtdE59v; dmarc=pass (policy=none) header.from=linux.microsoft.com; spf=pass (imf21.hostedemail.com: domain of eahariha@linux.microsoft.com designates 13.77.154.182 as permitted sender) smtp.mailfrom=eahariha@linux.microsoft.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1731705701; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=2qNmVTIUPIQHjxG6U+oz3oOJorUpDTvltiEua1kgDGM=; b=O1SUF9BOKE2FavumK0aNeWoGfmhGqJL+Q8Z6WkGxCUXRtVTAMqFySC9CCMfx/B4GiFOyrT C2qS3FmkFLTvoavdSQllPBuxvDoP5h1CY92pA2mNAsOtbFDQOVREp+3y3yrrEsHMX6sTL5 suRksHfE0+DY8h6QYVf0DXR8o54sTFU= Received: from eahariha-devbox.internal.cloudapp.net (unknown [40.91.112.99]) by linux.microsoft.com (Postfix) with ESMTPSA id ADD5A206BCE7; Fri, 15 Nov 2024 13:22:42 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com ADD5A206BCE7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1731705762; bh=2qNmVTIUPIQHjxG6U+oz3oOJorUpDTvltiEua1kgDGM=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=jwtdE59vuxdQNE0RiS/g1dZX+uqTWG/w9IblshEquJbSzhtkY3Zk6fbDpk+PaYqJ3 QDyNOhOWd9ZJoQqLoj3N42Lk4lBijUYlMVpBY8G/XYg13FKv7CiQTz5tjAvkJe5Ryj q0FRAVEgJKXl2OZRO71N5d2wqJQesfADXbZgbw84= From: Easwar Hariharan Date: Fri, 15 Nov 2024 21:22:34 +0000 Subject: [PATCH 04/22] s390: kernel: Convert timeouts to use secs_to_jiffies() MIME-Version: 1.0 Message-Id: <20241115-converge-secs-to-jiffies-v1-4-19aadc34941b@linux.microsoft.com> References: <20241115-converge-secs-to-jiffies-v1-0-19aadc34941b@linux.microsoft.com> In-Reply-To: <20241115-converge-secs-to-jiffies-v1-0-19aadc34941b@linux.microsoft.com> To: Pablo Neira Ayuso , Jozsef Kadlecsik , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Julia Lawall , Nicolas Palix , Daniel Mack , Haojian Zhuang , Robert Jarzmik , Russell King , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Ofir Bitton , Oded Gabbay , Lucas De Marchi , =?utf-8?q?Thomas_Hellstr=C3=B6?= =?utf-8?q?m?= , Rodrigo Vivi , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Jeroen de Borst , Praveen Kaligineedi , Shailend Chand , Andrew Lunn , James Smart , Dick Kennedy , "James E.J. Bottomley" , "Martin K. Petersen" , =?utf-8?q?Roger_Pau_Mon?= =?utf-8?q?n=C3=A9?= , Jens Axboe , Kalle Valo , Jeff Johnson , Catalin Marinas , Andrew Morton , Jack Wang , Marcel Holtmann , Johan Hedberg , Luiz Augusto von Dentz , Greg Kroah-Hartman , Florian Fainelli , Ray Jui , Scott Branden , Broadcom internal kernel review list , Xiubo Li , Ilya Dryomov , Josh Poimboeuf , Jiri Kosina , Miroslav Benes , Petr Mladek , Joe Lawrence , Jaroslav Kysela , Takashi Iwai , Lucas Stach , Russell King , Christian Gmeiner , Louis Peens , Michael Ellerman , Nicholas Piggin , Christophe Leroy , Naveen N Rao , Madhavan Srinivasan Cc: netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, cocci@inria.fr, linux-arm-kernel@lists.infradead.org, linux-s390@vger.kernel.org, dri-devel@lists.freedesktop.org, intel-xe@lists.freedesktop.org, linux-scsi@vger.kernel.org, xen-devel@lists.xenproject.org, linux-block@vger.kernel.org, linux-wireless@vger.kernel.org, ath11k@lists.infradead.org, linux-mm@kvack.org, linux-bluetooth@vger.kernel.org, linux-staging@lists.linux.dev, linux-rpi-kernel@lists.infradead.org, ceph-devel@vger.kernel.org, live-patching@vger.kernel.org, linux-sound@vger.kernel.org, etnaviv@lists.freedesktop.org, oss-drivers@corigine.com, linuxppc-dev@lists.ozlabs.org, Anna-Maria Behnsen , Easwar Hariharan X-Mailer: b4 0.14.2 X-Rspam-User: X-Rspamd-Queue-Id: CC5961C000E X-Rspamd-Server: rspam01 X-Stat-Signature: p5qzer8cfy5s781njdu5guhcu53z67w4 X-HE-Tag: 1731705678-662095 X-HE-Meta: U2FsdGVkX1/bT9W7xoyyIo3dBJfjYkjjy3O4AlHaobYNFSEwnur270tjB408l3ASMfVV6NHfcXplXP+gtdVVpzWncEbHiVu9bENY1C7LMv2K1r8MRY1AtwfgZv5VkmwIesGS3HmAQKQObPwHypspaDhfEgA+IYQKCeZ78Dx/cw6ZxBKPm4XvoNldUfmBi9iCHSrS/gdub16g/35tRlj9W1a4KpjtBwsg88cRvL3PVy2nLnaCTbn3/oi8ji9UFmFPZ7+T8bHHy1IX2xh72/Df9MpTbX3XfoohBLACa/aezxvgBNwAzY8YfLM69OL03nb4d9/75Tly75bYVBHAHU4P6rwz30w9SBH4Lhk1Q55853v0lsMWsNbFJKd2BG0g3ZUoWb2Mw7xuZLlqpj1msfE+A7C70PDxNPJZDvrM0gwwblhKnzKh1eALiI4CmGOzn8xubftDNFlw6Lyja0IwxwjqQBHuNGDnJA+iiRW8jN9O8FFjubpaGy4+3LRWURWYOu/tXFrm/Z/gQ8SOMkW12YvOne92TSsygfprESuu50MCfj1fdf0z05GhCdkOcHnlRkaPYhWlEjP4t7rVsJw2LmcvRfGhhLraj/1biseBvY53pWnLCNA5ePh04HZ4wDFSFkkvsvKcQTmqx87RzCPbnpOV51hDhPz9ShY6O9672djNwtUFzYfU4vaZjdH/PZgfSf3qtGm8i6esykwlXrXhJU2RNOZB+M6cbUnBtkLzuZeP+5qMRMZDHNREfN55leiz9ysD30ROWD1603l1bNwbOvdhVb/c2S7Kh0rilryrEBENNd9Q0+hZO43kUbLP47ptD0C89lZPHLpK3InLY8avQu/hI7WuIXdHxw4EGTZWxE92MhdjW9Km3dgTY59YuGveIkIKYO1uqmu1fjpV+92zgZJZ59F13p3p3YGXzchNmtNnd6P5RwJFaqnc2fEOwUaeNk3whsTgCtYkE2WR/VVjcno ofkjG/M1 fUE9Ofuf4GMi9ab9VTJO2M8QDvp404Q/Ng7DyMB+D4JHySU7VOR2T8I31mvN/Ecd9hFZcoqxFzXA4gA5FoBGvJSBQBLKxV2X1RMs+ydE0/ger/0cN/Mxt7TQS1x6oEclQzZWbzAnNY9I6rUihhjq8NS02E0uC5DZFOmzgy0iD+82oR4a3pU8RnKH5SnceXtl3JFV2JB15UiqwiQph52wNfRdbEGXx0H73RWlMWJIiehDIhi6N6Vubr8wAo2kG8487kRNR4Fph5IMmESB4qickU/VoDYUYkJp7zsJKMRKm4Dg47/P+Og5IkCswU02DBO0Jmf8ZA5SKQBSKZhcc6j5fn+Wu+VsBqEq0wA6lWhpIk3QT0OaTmZDy6VlJR8hIG70eOad8+DX5s9HIdb4FM5fwR1+8xtuO/CUS81vzTDvv4Pu1Xue/Ej1E7AZNCPbkx2xdGwz2 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Changes made with the following Coccinelle rules: @@ constant C; @@ - msecs_to_jiffies(C * 1000) + secs_to_jiffies(C) @@ constant C; @@ - msecs_to_jiffies(C * MSEC_PER_SEC) + secs_to_jiffies(C) Signed-off-by: Easwar Hariharan --- arch/s390/kernel/lgr.c | 3 ++- arch/s390/kernel/time.c | 4 ++-- arch/s390/kernel/topology.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/arch/s390/kernel/lgr.c b/arch/s390/kernel/lgr.c index 6652e54cf3db9fbdd8cfb06f8a0dc1d4c05ae7d7..68021cb38574b122bbe3d9f70e9168305360017b 100644 --- a/arch/s390/kernel/lgr.c +++ b/arch/s390/kernel/lgr.c @@ -166,7 +166,8 @@ static struct timer_list lgr_timer; */ static void lgr_timer_set(void) { - mod_timer(&lgr_timer, jiffies + msecs_to_jiffies(LGR_TIMER_INTERVAL_SECS * MSEC_PER_SEC)); + mod_timer(&lgr_timer, + jiffies + secs_to_jiffies(LGR_TIMER_INTERVAL_SECS)); } /* diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c index b713effe057967623f64da8297314fcc42ff1af2..e28c61d39d27c6e89f490e779ff674ba2fe21d3e 100644 --- a/arch/s390/kernel/time.c +++ b/arch/s390/kernel/time.c @@ -656,12 +656,12 @@ static void stp_check_leap(void) if (ret < 0) pr_err("failed to set leap second flags\n"); /* arm Timer to clear leap second flags */ - mod_timer(&stp_timer, jiffies + msecs_to_jiffies(14400 * MSEC_PER_SEC)); + mod_timer(&stp_timer, jiffies + secs_to_jiffies(14400)); } else { /* The day the leap second is scheduled for hasn't been reached. Retry * in one hour. */ - mod_timer(&stp_timer, jiffies + msecs_to_jiffies(3600 * MSEC_PER_SEC)); + mod_timer(&stp_timer, jiffies + secs_to_jiffies(3600)); } } diff --git a/arch/s390/kernel/topology.c b/arch/s390/kernel/topology.c index 813e5da9a9737e05ec3ef85a495fe38cbb40c49b..99095ff3897c1b5337f7e2abcf10f3fe8219ad7c 100644 --- a/arch/s390/kernel/topology.c +++ b/arch/s390/kernel/topology.c @@ -370,7 +370,7 @@ static void set_topology_timer(void) if (atomic_add_unless(&topology_poll, -1, 0)) mod_timer(&topology_timer, jiffies + msecs_to_jiffies(100)); else - mod_timer(&topology_timer, jiffies + msecs_to_jiffies(60 * MSEC_PER_SEC)); + mod_timer(&topology_timer, jiffies + secs_to_jiffies(60)); } void topology_expect_change(void)