From nobody Thu Nov 28 13:30:11 2024 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 4Xzcch1zndz5fjZN; Thu, 28 Nov 2024 13:30:12 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xzcch0jTyz4mL5; Thu, 28 Nov 2024 13:30:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732800612; 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=QH2VrCO7VDOFBPmhMNLGlF/DITeLLf0+6xTVG70Lv30=; b=DBS5I0H7uN7syLhwvokoS3gimAc83saWiLUMuxFZBf8O387Hv6Bzx8CujLu6t2TCjET1BF uSvVLYRDS6XlWWUvhkJnfqIZU8cVQJFDSl+nVcp20ybykv3F4JZoEpdYF+c/KFTBXj1YNm XZZJMP9SUiuoPpnz4eZQNiM8NY6YTGxQzrn7Pgh7NaQrUiCUU9ruQr/bTi2rVrKuQD5e8D 3xFdj2xvNrwi4NMzfUE36dNu5fhtLdZFmvsOgWiK+jkATJfCnaKqNBnKQ41nzxD9BD2ajn bSALCPp4r1x7JuZF7d5jfSLY18RFoRu43vI0bH7s+CFivKBHOG0QS3sbmmZODQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732800612; 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=QH2VrCO7VDOFBPmhMNLGlF/DITeLLf0+6xTVG70Lv30=; b=t91ceYmDY286iVGwR/cSAL5MTkoFyTVZWb67BBm9OGe0+qzyKUz2IdObOwbLK4Azi5gw77 VpZG47+/0xFVykmzHsK033T+C7gNCxipuNie3wnvXWvzKEJvxx5ldMDpltkU0bR7QxjEDc 2sCdm1eyknI20Xxwv0W6WafX1l9aVj/zXPK68LzjiUrS11l8SCZ7FPC8wjrIMwBufJUeKY wd65tk7qDFPC4I4gtan1r8z++v2Uh97q0TI161FSk9YXjnVVFN0IE/Ib47M1pVl+9i3ref 9SeAZvtdpINOTNZaNzIcnP/oN0zvfcrRQ8KmoP4gZuGfW7pBi+2W11QpbyxhWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732800612; a=rsa-sha256; cv=none; b=SF3pYN5UTRftdPiRXfI2zy2+jDNphhXVJ24zykAJhn+EI756KPz9tRxq/o9fWPfrHIRUXG 6ow7F14RBoUls+wjjC74zgM2w4b12VdiZZwyTe18TXjmhJAr77y9n8WPxcZVFR18kYSmCs D1iYSzBfYOhVv0MLvzHhIK8qymC1vf5j1pxuF8S2y8Y5H/j+mt7XU9AKVYPJiwX+P7mM7N fzu11+8Iv4IJ5WReJunroODLv7rroGLvcihWkHG6F7hgevSsaBk+cRz3sg0hLtJNmapwWH EWjFI8PuLXS4wmF6gz21ZNRRn/3aZ6Ksa7PZ5oY6rSSbuLLX5OLcj6O1EDVTfg== 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 4Xzcch0HR8zgmn; Thu, 28 Nov 2024 13:30:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4ASDUBrD010972; Thu, 28 Nov 2024 13:30:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4ASDUBKl010963; Thu, 28 Nov 2024 13:30:11 GMT (envelope-from git) Date: Thu, 28 Nov 2024 13:30:11 GMT Message-Id: <202411281330.4ASDUBKl010963@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 1c65ea28841a - stable/14 - efirt: Fix the TDP_EFIRT assertion 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1c65ea28841ae709f199680296004d6b81bfa375 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1c65ea28841ae709f199680296004d6b81bfa375 commit 1c65ea28841ae709f199680296004d6b81bfa375 Author: Mark Johnston AuthorDate: 2024-11-22 14:19:37 +0000 Commit: Konstantin Belousov CommitDate: 2024-11-28 12:53:17 +0000 efirt: Fix the TDP_EFIRT assertion (cherry picked from commit 07593d13fa2ad6fe4d962b7473c6020aef2a0414) --- sys/dev/efidev/efirt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/efidev/efirt.c b/sys/dev/efidev/efirt.c index 92ffeae12734..a74ce9fa9a06 100644 --- a/sys/dev/efidev/efirt.c +++ b/sys/dev/efidev/efirt.c @@ -323,7 +323,7 @@ efi_leave(void) pmap_t curpmap; td = curthread; - MPASS((td->td_pflags2 & TDP2_EFIRT) == 0); + MPASS((td->td_pflags2 & TDP2_EFIRT) != 0); td->td_pflags2 &= ~TDP2_EFIRT; efi_arch_leave();