From nobody Mon Jun 06 15:30:03 2022 X-Original-To: dev-commits-src-main@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 CD2051BE27F2; Mon, 6 Jun 2022 15:30:05 +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 4LGy993fgjz4TGG; Mon, 6 Jun 2022 15:30:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654529405; 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=LYhf2TOBLHy0nN6jzGrluDf9DP0KaKuzxWDafJ7d7/0=; b=nk4a/ExXfIuIZzr4dj6Nl+MH1C2EB2hLUaZ3IaVA+QFKaAyHNZq5nbv2GYeEYEeLV0BfgF O1vb/Y+69XLcBdNbgL3RgXKfQBdLt8PEerCxLdqcWXu/0YHqNeF01+ugmss7Q6LWLIFCMO I9z4UAPUMDyFemooXPJVb0m205ev6W9z/6T5gzTla94fnJN3b27tWAvbnsOJFithqGHXvs su4W9xCsUbtZY1Buc6ltXEDqb6SnrohiAddrGH7/A/Lnwpl9dI/ASTlL6/k6AEuW6wz3QB wplOlOXEqVTx/Rx0XPcmey6dTT/lbi/773wXoOIJ8Ing2f84YNbi/tktNuCrDg== 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 CE8FEB19; Mon, 6 Jun 2022 15:30:04 +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 256FU31C053554; Mon, 6 Jun 2022 15:30:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 256FU3IX053551; Mon, 6 Jun 2022 15:30:03 GMT (envelope-from git) Date: Mon, 6 Jun 2022 15:30:03 GMT Message-Id: <202206061530.256FU3IX053551@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: 8d95f5005211 - main - smp: Use local copies of the setup function pointer and argument List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 8d95f500521128c2b40270bdd703a54b56dbccf2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654529405; 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=LYhf2TOBLHy0nN6jzGrluDf9DP0KaKuzxWDafJ7d7/0=; b=XhZ5FdlDsy5QDUa38p1UZY5jc8KrqBpTfnWvhp6P96j+HRFO1NRbDxHO9znop1SDNWf29Z RPMOzP7rotLrbXHxOjO8R8r3Vlv9xTzs2ddZOg2leV8hDQ/KPn+bccowbrWU1ApewtvJ7I z3FSIMs3CDOF7NaY6jUCTx14s9a8yGJgZWofzxeTIwLQ7EIy5PFZWm4qinTyEyZ8QLgna1 rb0W9KyCYutjLZvcblEbm3tEsSYKHUxzL0GS86nwEaGbIz4LlLgW6H2swTfM8xeOZu4vMu VHvkDDT0InOzV36J/kdSQALiSUn1YMiicRE+lcYAWqg800lefIFZWDYHIC9gZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654529405; a=rsa-sha256; cv=none; b=wVhJOmaBoKZBn9Ig6FxwdVA+kshTV62vErPBaY63OLZZAGKx5fFZh/FOr6jEQvUapWbwcU aSg+St8dhTFcnzG/KblsUvSSVfi4g+tySwC2vF2HYhRbPKFRLe6RG2IKriFWESpDK0WqFX On+PXl+KBZHA4ebZubhBCiwfNkA6PjvlRE6kCFelaQbXUHdRj/VXioZEO+KvQAzkbrNM4c FekfcHjcC+OuBeG4tpM6u3JuReYvTnTg3TyCyqr5ryz7Ssznlm2rjj1aqrcT4jR9QIjEYS KTfxeO8b7+GdwC3Ylft92vuy9eqr29lxC+oJARIvtbqQ/ukGVK/H8OCYG3jWxQ== 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=8d95f500521128c2b40270bdd703a54b56dbccf2 commit 8d95f500521128c2b40270bdd703a54b56dbccf2 Author: Yuichiro NAITO AuthorDate: 2022-06-06 15:21:33 +0000 Commit: Mark Johnston CommitDate: 2022-06-06 15:29:51 +0000 smp: Use local copies of the setup function pointer and argument No functional change intended. PR: 264383 Reviewed by: jhb, markj MFC after: 1 week --- sys/kern/subr_smp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c index a677075937e6..d66120666f9d 100644 --- a/sys/kern/subr_smp.c +++ b/sys/kern/subr_smp.c @@ -500,8 +500,8 @@ smp_rendezvous_action(void) * function before moving on to the action function. */ if (local_setup_func != smp_no_rendezvous_barrier) { - if (smp_rv_setup_func != NULL) - smp_rv_setup_func(smp_rv_func_arg); + if (local_setup_func != NULL) + local_setup_func(local_func_arg); atomic_add_int(&smp_rv_waiters[1], 1); while (smp_rv_waiters[1] < smp_rv_ncpus) cpu_spinwait();