[src/trunk]: src/sys/external/bsd/drm2/dist/drm/ttm Handle removal of local v...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0400edf0d986
branches:  trunk
changeset: 835155:0400edf0d986
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 07:45:23 2018 +0000

description:
Handle removal of local variable in merge.

diffstat:

 sys/external/bsd/drm2/dist/drm/ttm/ttm_bo_util.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 8183c831759e -r 0400edf0d986 sys/external/bsd/drm2/dist/drm/ttm/ttm_bo_util.c
--- a/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo_util.c  Mon Aug 27 07:45:12 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo_util.c  Mon Aug 27 07:45:23 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ttm_bo_util.c,v 1.9 2018/08/27 07:45:12 riastradh Exp $        */
+/*     $NetBSD: ttm_bo_util.c,v 1.10 2018/08/27 07:45:23 riastradh Exp $       */
 
 /**************************************************************************
  *
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ttm_bo_util.c,v 1.9 2018/08/27 07:45:12 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttm_bo_util.c,v 1.10 2018/08/27 07:45:23 riastradh Exp $");
 
 #include <drm/ttm/ttm_bo_driver.h>
 #include <drm/ttm/ttm_placement.h>
@@ -536,7 +536,7 @@
 #ifdef __NetBSD__
        linux_mutex_init(&fbo->wu_mutex);
        drm_vma_node_init(&fbo->vma_node);
-       uvm_obj_init(&fbo->uvmobj, bdev->driver->ttm_uvm_ops, true, 1);
+       uvm_obj_init(&fbo->uvmobj, bo->bdev->driver->ttm_uvm_ops, true, 1);
        mutex_obj_hold(bo->uvmobj.vmobjlock);
        uvm_obj_setlock(&fbo->uvmobj, bo->uvmobj.vmobjlock);
 #else