From nobody Mon Jul 25 13:54:55 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 4Ls1kl6YJKz4XXyK; Mon, 25 Jul 2022 13:54:55 +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 4Ls1kl4Ymfz4Lqp; Mon, 25 Jul 2022 13:54:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658757295; 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=qHs+0kDR3HFwQoFwjVCYWdj6hgOUyqmZcYxrr5nTL9A=; b=tVWKJGhxw6Ky+zWYpeDWGeNaIGUYap8VjbTDRqSDDxYVmW5DmKz6xytw4h4ZUJWQfl5Qjw iJsPhrO0LDXjxVGmED5zyJKJBxOjyM+rNlxWd3IzltSvn+HBApbWdX31RMPRWCTKjMU2w4 eeJJLu6vtH3SZh5yEw37B/6rDS5HmU/3hqyrWIsFtMrLrwKwribstQOpTRQjYcvaSdISbk Gn5rL6wFM6rb6tQ+M0Ktq/h9yHYyOjevGfeSxZs3jERYwTpQea86D25Ajy9baLTdXYORCE Kp7UmekHqOoaqumYGJ3IX7k24r1/xaUdcnqKLQNBiyy4+jcYd99IkUPyiEWA9Q== 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 4Ls1kl3dCTz10L8; Mon, 25 Jul 2022 13:54:55 +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 26PDstJ2019823; Mon, 25 Jul 2022 13:54:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26PDstXR019822; Mon, 25 Jul 2022 13:54:55 GMT (envelope-from git) Date: Mon, 25 Jul 2022 13:54:55 GMT Message-Id: <202207251354.26PDstXR019822@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 68a573cc5d06 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 68a573cc5d06099fcf55a67f3eb3368cc3705081 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658757295; 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=qHs+0kDR3HFwQoFwjVCYWdj6hgOUyqmZcYxrr5nTL9A=; b=Ih0RFDplE/ceK77ez/DzFz/9864JCPPt5e5eO3oxQvkBWbpUTpBGEV9b9U6jcT+JhV4RdF 9w7RSWZRzgTiW/jzy4Ti46BFXYppxKV/1R7Ga/ReREryxhbX1oGSQb9NsjJ+jLzJm5zRmF lanCkEAV6PsIHpG5BET3IKoXMj4a2mnPtjd2YDqexV4tuHk79CBfB9etGZb2RPf4qXM0pC VecUSvO2b08IRIoPmb8JOGgYxLkzDhcjl9CWKdiIBFrwkOpyOQxaF3g8Jki/L5mxu393ns u+ysg3sMPEbNz+kdP/sZHIJQWYJCSs3dweILkRLgbD0xl0H8adK61E5zSizDuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658757295; a=rsa-sha256; cv=none; b=V9QPDSkLhiV0/km9WCzNz+YQQKkAAncefiJlF4QFIWMLIUTaXhgXKw2G5iZ/ymR+PLoCBI R8TzRtOa6CXGDMk8Hy1ifcdhbnMSG4MC8uYgMGYgYS8tFHkdRU8gPkLMwGQMX0ngONfpQx j2pZRR6Uhvd+4H4BWzGZ0OY5Sy8VjN+CPYpm4B3OKekZnr4iGZ2FYlPNJ1HhZ95D1tnanB B5DU2J2+2qVpyIEhrhbvqs1EqVPZzpWqEjU+U82hxhhkOiQair0OkAvvAXCaZR7Mtbr6Iv JpoXzS7LpgK4UhhBR5+f8zodkmIo+TAFKW6alzxtjYqqmKK/jcRepGdKsYKCLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=68a573cc5d06099fcf55a67f3eb3368cc3705081 commit 68a573cc5d06099fcf55a67f3eb3368cc3705081 Author: Mark Johnston AuthorDate: 2022-06-30 17:31:57 +0000 Commit: Mark Johnston CommitDate: 2022-07-25 13:45:01 +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. Sponsored by: The FreeBSD Foundation (cherry picked from commit aac7c7ac545804889d3bc28fae4efbcc07bcb6d3) --- 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 85f342cdeb3b..016365a9bea0 100644 --- a/sys/kern/kern_timeout.c +++ b/sys/kern/kern_timeout.c @@ -564,7 +564,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; @@ -597,7 +597,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); } } @@ -774,7 +774,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 @@ -1023,7 +1023,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));