From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Aug 7 17:30:01 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 39106A9C for ; Wed, 7 Aug 2013 17:30:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 16EEC2ACC for ; Wed, 7 Aug 2013 17:30:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r77HU0if025438 for ; Wed, 7 Aug 2013 17:30:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r77HU0Wi025417; Wed, 7 Aug 2013 17:30:00 GMT (envelope-from gnats) Resent-Date: Wed, 7 Aug 2013 17:30:00 GMT Resent-Message-Id: <201308071730.r77HU0Wi025417@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Nikolai Lifanov Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 603287CD for ; Wed, 7 Aug 2013 17:21:00 +0000 (UTC) (envelope-from lifanov@mail.lifanov.com) Received: from mail.lifanov.com (mail.lifanov.com [206.125.175.12]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4EA022A54 for ; Wed, 7 Aug 2013 17:21:00 +0000 (UTC) Received: by mail.lifanov.com (Postfix, from userid 1001) id 7818D1A40F4; Wed, 7 Aug 2013 17:20:59 +0000 (UTC) Message-Id: <20130807172059.7818D1A40F4@mail.lifanov.com> Date: Wed, 7 Aug 2013 17:20:59 +0000 (UTC) From: Nikolai Lifanov To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/181118: [patch] x11/nvidia-driver X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: Nikolai Lifanov List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Aug 2013 17:30:01 -0000 >Number: 181118 >Category: ports >Synopsis: [patch] x11/nvidia-driver >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Wed Aug 07 17:30:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Nikolai Lifanov >Release: FreeBSD 9.1-RELEASE-p5 amd64 >Organization: >Environment: System: FreeBSD mail.lifanov.com 9.1-RELEASE-p5 FreeBSD 9.1-RELEASE-p5 #0: Sat Jul 27 01:14:23 UTC 2013 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64 >Description: FreeBSD base revision r254025: Replace kernel virtual address space allocation with vmem. This specifically broke kmem_free and kmem_alloc_contig functions, which are used in nvidia-driver port. This patch fixes the problem. However, OSVERSION > 1000040 is a bit imprecise, since r254025 doesn't come with a param.h bump. >How-To-Repeat: Update to CURRENT above r254025 make -C /usr/ports/x11/nvidia-driver >Fix: Apply this patch. --- patch.txt begins here --- Index: x11/nvidia-driver/Makefile =================================================================== --- x11/nvidia-driver/Makefile (revision 324359) +++ x11/nvidia-driver/Makefile (working copy) @@ -111,6 +111,12 @@ .endif post-patch: .SILENT +.if ${OSVERSION} > 1000040 + ${REINPLACE_CMD} -e 's/kmem_free(kernel_map,/kva_free(/g ; \ + s/kmem_alloc_contig(kernel_map,/kmem_alloc_contig(kernel_arena,/g' \ + ${WRKSRC}/src/nvidia_subr.c +.endif + # We should support -CURRENT: kill the check ${REINPLACE_CMD} -e '24,26d' ${WRKSRC}/src/nv-freebsd.h # Adjust legacy drivers for updated d_mmap() since FreeBSD src SVN r201223 --- patch.txt ends here --- >Release-Note: >Audit-Trail: >Unformatted: