From nobody Sun Jul 17 17:58:39 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4LmCWg3qWZz4WtrH; Sun, 17 Jul 2022 17:58:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LmCWg3H8Nz431j; Sun, 17 Jul 2022 17:58:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658080719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ynB0s+MwSGqZPEghmd84JwZB/DMC3E8FKZav0uP9rtA=; b=h8vLKoQCzkCLJEIZwT9W9SiaHwP87JTyhBj0G/qg2HVsJuRDdzuaP9STwd2h4sU+SZCPUd QUmVYXohAS+1icgSLxZ/Ir38UvAlsWhggmTszJK+BByeuLXxhnU/YdZkDIMnVMn6K0U1VN mBK1rffcWrKjjOJ8KODuchh21B6TJmyD1uXwO9AYDCp5l3Fl8PNhQaDG+idpC+tcA5i+8A oT++rqAnfTAHVxR4qohKIehOi09+9gGjXZZIZdCb7PXhvTMpo3e+JvUROmp5fU2pNFkJNo pqzDm5wEr74qW+3+dsgeRy8bIO3eu7k1tqug9+GFTjPQmoONxQoa5bq951otPA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4LmCWg2JVsz18Hd; Sun, 17 Jul 2022 17:58:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26HHwdbF043519; Sun, 17 Jul 2022 17:58:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26HHwdv1043518; Sun, 17 Jul 2022 17:58:39 GMT (envelope-from git) Date: Sun, 17 Jul 2022 17:58:39 GMT Message-Id: <202207171758.26HHwdv1043518@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: aac7c7ac5458 - main - callout: Remove a redundant parameter to callout_cc_add() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aac7c7ac545804889d3bc28fae4efbcc07bcb6d3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658080719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ynB0s+MwSGqZPEghmd84JwZB/DMC3E8FKZav0uP9rtA=; b=D4CqggKS4egmW43fiMRJXoqR3yggzirzWMkGx4Jh8hq/xCAxFSlfzlV4fpl4CNw8iPNqkq kqxT2Sn/BiJHOhjA4r23lnvdNsBbJ5xC720l5ZVMhwSZ6P0oi9tHxgPH1FEGq9eUUn54mL dkVRdyuB+eJ7zrIWjmW8WpXZU6kJvCKfkWqdqBwLuIUY3XzXs/ekCkJEZ0axQFQSnXFAXg RX+DKAsjl7urNszG/05VILxNGaR20OfzKmrYdUMvIlv/Lk/9qG220oOKv+TfkSzHmJ7Njq o4oukFAuSEBaZSmA5Qe/AYeqp8tNrBXHSwNoAhQUn2z205nbMBZLDiFVJRoP9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658080719; a=rsa-sha256; cv=none; b=JsCVH2krXlHfnC3q89mHNIj9LWOP7P39Sc81wBBzEN+IZfHsv4S6gIpPwkXLr3UA5Pqcgt IGR7po6up3e1+WMEGRMKeJlPvWAigzQozKB0KP/NLU9FBQV36gWluAtIZuRIDabasUtd1O 3KxNT4owYKcOxFitUEfuN2eY5rcm/I9qvIWj+e0NQ+Tx21diKHA5yRdOrUCtPITs8Uqy3Y CkaFbCiwu0qVsXSjEVdzDwZsfulTSen9H0YGqXxonHJeyT+1BmKyhfXy5uCfqxGrQQ9K+e oX/DdEkTkfcInlGKMbDJSime97GpcVnLj/ieCTrxkfTdhUydE/gj25qtGmR+cA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=aac7c7ac545804889d3bc28fae4efbcc07bcb6d3 commit aac7c7ac545804889d3bc28fae4efbcc07bcb6d3 Author: Mark Johnston AuthorDate: 2022-06-30 17:31:57 +0000 Commit: Mark Johnston CommitDate: 2022-07-17 17:58:19 +0000 callout: Remove a redundant parameter to callout_cc_add() The passed cpuid is always equal to the one stored in the callout structure. No functional change intended. MFC after: 1 week Sponsored by: The FreeBSD Foundation --- sys/kern/kern_timeout.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c index 23ddd03ae72e..2bd469f94080 100644 --- a/sys/kern/kern_timeout.c +++ b/sys/kern/kern_timeout.c @@ -593,7 +593,7 @@ callout_lock(struct callout *c) static void callout_cc_add(struct callout *c, struct callout_cpu *cc, sbintime_t sbt, sbintime_t precision, void (*func)(void *), - void *arg, int cpu, int flags) + void *arg, int flags) { int bucket; @@ -626,7 +626,7 @@ callout_cc_add(struct callout *c, struct callout_cpu *cc, sbt = c->c_time + c->c_precision; if (sbt < cc->cc_firstevent) { cc->cc_firstevent = sbt; - cpu_new_callout(cpu, sbt, c->c_time); + cpu_new_callout(c->c_cpu, sbt, c->c_time); } } @@ -803,7 +803,7 @@ skip: new_cc = callout_cpu_switch(c, cc, new_cpu); flags = (direct) ? C_DIRECT_EXEC : 0; callout_cc_add(c, new_cc, new_time, new_prec, new_func, - new_arg, new_cpu, flags); + new_arg, flags); CC_UNLOCK(new_cc); CC_LOCK(cc); #else @@ -1062,7 +1062,7 @@ callout_reset_sbt_on(struct callout *c, sbintime_t sbt, sbintime_t prec, } #endif - callout_cc_add(c, cc, to_sbt, precision, ftn, arg, cpu, flags); + callout_cc_add(c, cc, to_sbt, precision, ftn, arg, flags); CTR6(KTR_CALLOUT, "%sscheduled %p func %p arg %p in %d.%08x", cancelled ? "re" : "", c, c->c_func, c->c_arg, (int)(to_sbt >> 32), (u_int)(to_sbt & 0xffffffff));