From nobody Tue Oct 11 14:54:50 2022 X-Original-To: dev-commits-ports-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 4MmzMt3Khvz4ddfr; Tue, 11 Oct 2022 14:54:50 +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 4MmzMt2W8Wz3qQW; Tue, 11 Oct 2022 14:54:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665500090; 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=B36lR769VqTwKzFxCCcA9gDSaKSC1rWdcDzKKP4vxWI=; b=oeOrfCLj6B7qKXdXcvV98ywryiAH1DnTRQ9quHUNRueRnOCKxK8k8CZiWPOt9HxfJ9goDl dFbEjpJnu1KuLMNwrMYnS8aXp5vAyfRn2eQB0Kr0qUkF1ER/n3lJX56sSC1fOtfb4Lz01U HJyeuarTaU+WCJUPVd2wSi4MIjS6g/3WMnfSuAQLTx6mcj1/IMDqOEwIXOA7xB+qElLoIg DpD4qzZkJzXdTL9gOPRMVKJ8mDQ4worR+bFihbjzPnXyJB5s3u3k0g2i9GC6ZuBjTr/J/4 3WbzXBPbrHgzU39rITJEYq8i4+MmakK6rVFpkSEJ65C0haj+uWemS9pZ+14H9w== 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 4MmzMt1WQvz10VR; Tue, 11 Oct 2022 14:54:50 +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 29BEsosp075462; Tue, 11 Oct 2022 14:54:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29BEsoLK075461; Tue, 11 Oct 2022 14:54:50 GMT (envelope-from git) Date: Tue, 11 Oct 2022 14:54:50 GMT Message-Id: <202210111454.29BEsoLK075461@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: d116de704f8e - main - x11/nvidia-driver: catch up with changes to pmap_unmapdev() and kmem_*() List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d116de704f8e5f24b4075679a87aeaa58e312926 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665500090; 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=B36lR769VqTwKzFxCCcA9gDSaKSC1rWdcDzKKP4vxWI=; b=TU3bcq00JLeXUoBz5OococODANbkWoEN3/mMhDKTXNXCV1u5Z2DDkAOqyOSa1j9rqegBs8 gB5buh1uo+pOJHiwtnX+KxNCbGewxsIjWyPRxAtvdQ51dWXibhc4SYojLjGb1z1XLAtxqc XzXPJOJ5Pbe8nLcVK/Aj6+NeLALdes03401Y45NQYn6kESJLiRWayYlbNJmOUyRZiAzF9X cKfybejGNCQrd1U7evCTVQ8qdYIDnFjJvGooV5+7G/hN4H1arTX4a68us0AORgfqloC18e WP/wSoJNjKbNaV0bvRJXNx4LVHTsIOQ3VQKLUDULb7G4PVrvoLfF0IMZGvv5Uw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665500090; a=rsa-sha256; cv=none; b=hNoPcOu0Ol9aT5wNNdz8xoNoBYg57YKQtDzFPuhsgy9cFEi0pTFITWSJYBXOr6+wIJb4nw YXpmVhN2wFfTqBsZyQDcdWUS1uBDJQcXmv61qe3APHGDOOOUb0229FJtwK0XcgOtFsNPre oufbOs9OfVxuD+cr3zwpUXWrlZtMuDFOrMugJo1RBoWOPwYIkhvsICBbqgw/ezBX6sJJL+ 93qt3S57xapXTaVHt2sguIMEAEDJixmzzz7R3uL5q4SSnTNbS6odfS+GsnbX6Bk/lC632n m8ZjqNKMJIs0u5M5E9FugjiB7SanH/tQiGsuFH+dYTHl+Lz61V9kyDS8Lx9JFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=d116de704f8e5f24b4075679a87aeaa58e312926 commit d116de704f8e5f24b4075679a87aeaa58e312926 Author: Alexey Dokuchaev AuthorDate: 2022-10-11 14:54:00 +0000 Commit: Alexey Dokuchaev CommitDate: 2022-10-11 14:54:00 +0000 x11/nvidia-driver: catch up with changes to pmap_unmapdev() and kmem_*() Reported by: pkg-fallout Differential Revision: https://reviews.freebsd.org/D36671 --- x11/nvidia-driver/Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile index 130794ace1f8..3140c72454db 100644 --- a/x11/nvidia-driver/Makefile +++ b/x11/nvidia-driver/Makefile @@ -237,6 +237,15 @@ post-patch: .SILENT ${REINPLACE_CMD} -e '/^DRIVER_MODULE/s/, nvidia_devclass//' \ ${WRKSRC}/src/${NVSRC}/nvidia_pci.c .endif +# Catch up with pmap_unmapdev() and kmem_*() changes in 14-CURRENT +.if ${OSVERSION} >= 1400070 + ${REINPLACE_CMD} -e '/pmap_unmapdev/s,(vm_offset_t),,' \ + ${WRKSRC}/src/${NVSRC}/nvidia_os.c + ${REINPLACE_CMD} -e '/vm_offset_t virtual_address/s,vm_offset_t ,char *,' \ + ${WRKSRC}/src/${NVSRC}/nv-freebsd.h + ${REINPLACE_CMD} -e '/vm_offset_t address;/s,vm_offset_t ,void *,' \ + ${WRKSRC}/src/${NVSRC}/nvidia_subr.c +.endif # Finally, process OPTIONS .if ${PORT_OPTIONS:MFREEBSD_AGP} ${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_OS_AGP)/define \1/' \