Error build nvidia-driver with r334555

[Mateusz Guzik]

On Sun, Jun 3, 2018 at 2:42 PM, Tomoaki AOKI <junchoon at dec.sakura.ne.jp>
wrote:

> This is caused by r334533 and/or r334534 (memset-related changes).
> sysutils/lsof is also affected.
>
> You should revert r334533 and r334534 temporarily until nvidia-driver
> support this change.
>
> CC'ing the revision author and maintainers of both ports.
>
>
Support in what sense? The error message clearly indicates a bug in the
driver
(also trivially fixable). Is there a problem adding a patch to files/?

diff -ru src.orig/nvidia/nvidia_subr.c src/nvidia/nvidia_subr.c
--- src.orig/nvidia/nvidia_subr.c    2018-06-03 13:19:56.490480000 +0000
+++ src/nvidia/nvidia_subr.c    2018-06-03 13:21:15.289344000 +0000
@@ -364,7 +364,7 @@
     }

     ci = args;
-    memset(ci, 0, sizeof(ci));
+    memset(ci, 0, sizeof(*ci));

     for (i = 0; i < NV_MAX_DEVICES; i++) {
         sc = devclass_get_softc(nvidia_devclass, i);


As for lsof:
--- dlsof.h.orig    2018-06-03 13:16:14.712701000 +0000
+++ dlsof.h    2018-06-03 13:17:15.042655000 +0000
@@ -489,6 +489,12 @@
 # endif        /* FREEBSDV>=2020 */

 #undef    bzero        /* avoid _KERNEL conflict */
+#undef    bcmp
+#undef    bcopy
+#undef    memcmp
+#undef    memmove
+#undef    memcpy
+#undef    memset
 #include <string.h>

-- 
Mateusz Guzik <mjguzik gmail.com>