[arch-commits] Commit in nvidia/trunk (PKGBUILD fs62142.patch)

[Sven-Hendrik Haase]

    Date: Sunday, November 10, 2019 @ 12:55:01
  Author: svenstaro
Revision: 367674

Remove fs62142.patch as reported by FS#64317

Modified:
  nvidia/trunk/PKGBUILD
Deleted:
  nvidia/trunk/fs62142.patch

---------------+
 PKGBUILD      |    3 ---
 fs62142.patch |   13 -------------
 2 files changed, 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-10 12:15:41 UTC (rev 367673)
+++ PKGBUILD	2019-11-10 12:55:01 UTC (rev 367674)
@@ -22,9 +22,6 @@
     sh "${_pkg}.run" --extract-only
     cd "${_pkg}"
 
-    # Fix https://bugs.archlinux.org/task/62142
-    patch -Np1 -i ../fs62142.patch
-
     cp -a kernel kernel-dkms
     cd kernel-dkms
     sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf

Deleted: fs62142.patch
===================================================================
--- fs62142.patch	2019-11-10 12:15:41 UTC (rev 367673)
+++ fs62142.patch	2019-11-10 12:55:01 UTC (rev 367674)
@@ -1,13 +0,0 @@
-diff --git a/kernel/nvidia/nv-dma.c b/kernel/nvidia/nv-dma.c
-index 73cdeed..e691014 100644
---- a/kernel/nvidia/nv-dma.c
-+++ b/kernel/nvidia/nv-dma.c
-@@ -606,7 +606,7 @@ static NvBool nv_dma_is_map_resource_implemented
- #if defined(NV_DMA_MAP_RESOURCE_PRESENT)
-     const struct dma_map_ops *ops = get_dma_ops(&nvl->dev->dev);
- 
--    return (ops->map_resource != NULL);
-+    return (ops && ops->map_resource);
- #else
-     return NV_FALSE;
- #endif