From nobody Mon Jun 13 12:43:35 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 2A3A4854EB7; Mon, 13 Jun 2022 12:43:36 +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 4LMB7r0gRnz3QkY; Mon, 13 Jun 2022 12:43:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655124216; 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=iKvB5n/2nNpjbGEVdUSbQO+GcQBk9ZK1tF7UgIEcj1o=; b=goNQxwd9tmKyMOGk2gsQvdooxDw29ReWzedtwVz1C2XY44V4KuujaBBa0UTRpi/YQ+1gG0 xYBMHHf5Wdi8cWuhZfuYlgj2VfETZUebFxh67UkR92xldVo3LwXrTb5NziipiBzAJaT2fV UyFeRynfjlCwBII3MfUNsJN0nhOy4wVewyiPc+spU8DgYyy/pSdId9EQQA0RgVaynZTR0i pgpTUQ1x+FE9+60u3DtI1Li8QdzDAJA7M1T9pHnI2pCqc+h8WJLxOJy0z4wQoqy2ziCHSa lRUvKg4SULCUYzCOHqf9anr0v7+pzR2JAkcMKpg5anQqO5p3960LKLZWUFwB6A== 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 EB63E15BD4; Mon, 13 Jun 2022 12:43:35 +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 25DChZKN069772; Mon, 13 Jun 2022 12:43:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25DChZ7C069771; Mon, 13 Jun 2022 12:43:35 GMT (envelope-from git) Date: Mon, 13 Jun 2022 12:43:35 GMT Message-Id: <202206131243.25DChZ7C069771@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: a39788bd281c - stable/13 - smp: Use local copies of the setup function pointer and argument 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: a39788bd281c3b297be37a2df79594c5cbb3ded8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655124216; 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=iKvB5n/2nNpjbGEVdUSbQO+GcQBk9ZK1tF7UgIEcj1o=; b=TCYtkjC5pmFYszIvu+4miXnudviy9SJRZi7qj+7Q5TUtfeUSRXEZ9QkNiGVspDE2yOw5Ib Z+leh4aL9/JlDS1pKoOhv/apwl0LlhYT9tXew8f3Vu8WkR5I+V6FjnGUD2E69HGu8TJUeV cX6JiyRPXkpeZcntcFBnl7hvhCZzNSbNC5usfAAwt6HM0vgKeQu/GEIbuBejNDg9FYAfx4 dy9nPHiXu0t62os7vKziIBvtI1ArXEm+F7qzeyIaCyawUbOGrP+KMqbT1pD5KrC6Hj1h3Y 12k6cPbzhxUx5U+g3Rd+BBd8KEzVy+v6QsIjXd6aM1YZ1MW+5xqvb1dCH2bnDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655124216; a=rsa-sha256; cv=none; b=GQJc/XOfGFJg9ESQsFilmc4afYrS2wTkshxFnfGrP1sWNHMdzmUej32kLxHdrJODLEBZB3 t/uHdodycHkuLJtnmawLrsjv06kdIvlHXkAmaLj0GotiQm5Di0N36obdPMnK4+bPNIL3Ao bCkSTXcL5onCON1rsS7Eq8ExLH95hvyCXwG8FDVwXY0vB9YcubMrWbd8MzniKSBRdSn6Pd tCw/Lc5ETGQlwo72uUmCMn7wS+dW9p1A/OVHj6uF/KECLCxhUqay+J/oYfR7SeZ2rpVRGP hSLpRGITrndj98ah6SO5aaZvrRWN/oIgl3sxBhC8zVxpJdXu2HuePbIzHG4WLg== 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=a39788bd281c3b297be37a2df79594c5cbb3ded8 commit a39788bd281c3b297be37a2df79594c5cbb3ded8 Author: Yuichiro NAITO AuthorDate: 2022-06-06 15:21:33 +0000 Commit: Mark Johnston CommitDate: 2022-06-13 12:43:06 +0000 smp: Use local copies of the setup function pointer and argument No functional change intended. PR: 264383 Reviewed by: jhb, markj (cherry picked from commit 8d95f500521128c2b40270bdd703a54b56dbccf2) --- 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();