From nobody Fri Apr 28 15:19:26 2023 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 4Q7GVQ4SqPz48bN2; Fri, 28 Apr 2023 15:19:26 +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 4Q7GVQ2DvGz44cR; Fri, 28 Apr 2023 15:19:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682695166; 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=tbfqdEVxqHi0SqIJnuzfAbzpTbqcUPzdmNkrcJAoOo0=; b=rrB/LuPeRYrfiSNJaKSft9zSkKDd+E/9iYYyZiSDF/UZccHpi0BQgim67X22aDH+pb0lUH PPAtiCvXroBrTNsHU+8QWubsHuywCDNfb68iOgT+mnzXRBU5G4Cg76F0hS70f+TbAYhuNr 7VE8Xs+DiysWsZRc0zQr442vNg+aSDFI/Na90xvgag8BkKCTKJ0yxoiogOGB1lqK2suY8R ID3l8xxXtK3YDDKHMaA9Z2iyDyNWbsAEZeJfd0eEi1sOwFluEi3Gj+RPdrIkkjODHqaixF FnfB1TpJncdGrIe+XLXKphjAe4cH8UjcUaROD5Nwvhe1mu8L3EAuGSSCtXHg2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682695166; 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=tbfqdEVxqHi0SqIJnuzfAbzpTbqcUPzdmNkrcJAoOo0=; b=h/kCf073UhUinq26io1qg9OWWRsGYe9ge1YqNccYxv24nTDt8/xE8CSRGUo2qF6jQgjD7b qiEL3ufqOkPao7ocKEVmzlyF/NHDUFxfAsWTavR960xCpMNn9PH9m00ZXCAUD2I7qqQn/U h1iAy08ZvVQjbT2DkrjD8QsIzpus2SHpDu9PqnM4O0WTXP6p4xnJv476O6GC7CfeY23tjB lApz+ecbYBKwLhf1kAzQhG8u8RGX5rbtsbFvEndMlS0uUgXObRm+B6ow5Vzz1LLhuAAXTx /OoR7kmdKqUFbCLwRCqCPSI3uidteubh+ZJ8P30A4ou4jQlTp1xVCdRQWf8kwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682695166; a=rsa-sha256; cv=none; b=ioYrg46ZQczxw4JP3zYw7KJOWNqC9HhQjDR4++vSWBZ20hG7lYS+b4EVBcj4vRRjtCP2j5 Vwl3w+hpD66OJuUklqP48OQnk/iA2adIS2FR+BsaB7eCd/fyQpHgRESfqsBX1ANSjGiwhW vVp/u1x4PkIBAn/GX+bV9XZXrBpfiw1YzoF2kRELRwRdEOrHlgnAcrJxgIP1YFo5dJos6c YxAJjiq8+m5gRFxcYPlLAmBElK2xvW43lFySrTE0Morjh1/cqaB1r+uuplb60cRKeiyO7y +TtrKTFqCNSrIpwOezuI92xFFd1PGZU/DLxjc5xLfES9Dd/PY8c6sZw8ckgg6Q== 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 4Q7GVQ1L4Nz14N9; Fri, 28 Apr 2023 15:19:26 +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 33SFJQ6u046041; Fri, 28 Apr 2023 15:19:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33SFJQDj046040; Fri, 28 Apr 2023 15:19:26 GMT (envelope-from git) Date: Fri, 28 Apr 2023 15:19:26 GMT Message-Id: <202304281519.33SFJQDj046040@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: b999f2458c5a - main - kinst: do not use DPCPU_ID_GET if we already have the trampoline 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: b999f2458c5af068a3b35245bf6905baa19e916c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b999f2458c5af068a3b35245bf6905baa19e916c commit b999f2458c5af068a3b35245bf6905baa19e916c Author: Christos Margiolis AuthorDate: 2023-04-28 15:11:10 +0000 Commit: Mark Johnston CommitDate: 2023-04-28 15:11:10 +0000 kinst: do not use DPCPU_ID_GET if we already have the trampoline No functional change intended. Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39870 --- sys/cddl/dev/kinst/amd64/kinst_isa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/cddl/dev/kinst/amd64/kinst_isa.c b/sys/cddl/dev/kinst/amd64/kinst_isa.c index f5fdeabd69e4..b89c3ce15a1a 100644 --- a/sys/cddl/dev/kinst/amd64/kinst_isa.c +++ b/sys/cddl/dev/kinst/amd64/kinst_isa.c @@ -612,7 +612,7 @@ kinst_md_deinit(void) CPU_FOREACH(cpu) { tramp = DPCPU_ID_GET(cpu, intr_tramp); if (tramp != NULL) { - kinst_trampoline_dealloc(DPCPU_ID_GET(cpu, intr_tramp)); + kinst_trampoline_dealloc(tramp); DPCPU_ID_SET(cpu, intr_tramp, NULL); } }