Date: Tue, 20 Aug 2013 03:21:51 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r325027 - head/x11/nvidia-driver Message-ID: <201308200321.r7K3LpcX091220@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Tue Aug 20 03:21:50 2013 New Revision: 325027 URL: http://svnweb.freebsd.org/changeset/ports/325027 Log: Fix NVidia drivers correctly after KVA space allocation API changes in recent -CURRENT (after r254025). Previously it would immediately core dump upon loading of nvidia.ko. PR: ports/181144 (fix suggested in the audit trail) Reviewed by: jhb Timeout from: jeff (no cookie) Modified: head/x11/nvidia-driver/Makefile Modified: head/x11/nvidia-driver/Makefile ============================================================================== --- head/x11/nvidia-driver/Makefile Tue Aug 20 02:01:23 2013 (r325026) +++ head/x11/nvidia-driver/Makefile Tue Aug 20 03:21:50 2013 (r325027) @@ -149,6 +149,11 @@ post-patch: .SILENT ${REINPLACE_CMD} -E 's/(VM_OBJECT_)(UN)?(LOCK)/\1W\2\3/' \ ${WRKSRC}/src/nvidia_subr.c .endif +# Adjust kmem(9) calls after FreeBSD src SVN r254025 +.if ${OSVERSION} > 1000040 + ${REINPLACE_CMD} -e '/kmem_/s/kernel_map/kernel_arena/' \ + ${WRKSRC}/src/nvidia_subr.c +.endif # Fix stack buffer overflow in nvidia_sysctl_bus_type() .if ${NVVERSION} < 3192300 ${REINPLACE_CMD} -E '/bus_type\[4\]/d ; \ @@ -156,11 +161,6 @@ post-patch: .SILENT /return SYSCTL_OUT\(req, bus_type/d' \ ${WRKSRC}/src/nvidia_sysctl.c .endif -# Catch up with KVA space allocation API changes in recent -CURRENT -.if ${OSVERSION} > 1000040 - ${REINPLACE_CMD} -e 's/kmem_free(kernel_map,/kva_free(/ ; \ - /kmem_alloc_contig/s/map/arena/' ${WRKSRC}/src/nvidia_subr.c -.endif # Process OPTIONS .if ${PORT_OPTIONS:MFREEBSD_AGP} ${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_OS_AGP)/define \1/' \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308200321.r7K3LpcX091220>