[src/trunk]: src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/fifo Yet ...

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

details:   https://anonhg.NetBSD.org/src/rev/cb842caf398c
branches:  trunk
changeset: 835788:cb842caf398c
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Sun Sep 09 03:12:51 2018 +0000

description:
Yet another diagused

diffstat:

 sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/fifo/nouveau_nvkm_engine_fifo_chan.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r d19aa427d4a7 -r cb842caf398c sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/fifo/nouveau_nvkm_engine_fifo_chan.c
--- a/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/fifo/nouveau_nvkm_engine_fifo_chan.c   Sun Sep 09 03:10:03 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/fifo/nouveau_nvkm_engine_fifo_chan.c   Sun Sep 09 03:12:51 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nouveau_nvkm_engine_fifo_chan.c,v 1.8 2018/08/27 14:54:33 riastradh Exp $      */
+/*     $NetBSD: nouveau_nvkm_engine_fifo_chan.c,v 1.9 2018/09/09 03:12:51 pgoyette Exp $       */
 
 /*
  * Copyright 2012 Red Hat Inc.
@@ -24,7 +24,7 @@
  * Authors: Ben Skeggs
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_engine_fifo_chan.c,v 1.8 2018/08/27 14:54:33 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_engine_fifo_chan.c,v 1.9 2018/09/09 03:12:51 pgoyette Exp $");
 
 #include "chan.h"
 
@@ -480,7 +480,8 @@
                bus_space_tag_t mmiot = device->mmiot;
                bus_space_handle_t mmioh = device->mmioh;
                bus_size_t mmiosz = device->mmiosz;
-               bus_addr_t mmioaddr = device->func->resource_addr(device, bar);
+               __diagused bus_addr_t mmioaddr =
+                   device->func->resource_addr(device, bar);
 
                /* Check whether it lies inside the region.  */
                if (mmiosz < base ||