Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/external/bsd/drm2/ttm oops, copied the code from the wro...



details:   https://anonhg.NetBSD.org/src/rev/9c51ebacfa3f
branches:  trunk
changeset: 822243:9c51ebacfa3f
user:      maya <maya%NetBSD.org@localhost>
date:      Thu Mar 09 08:05:21 2017 +0000

description:
oops, copied the code from the wrong diff. ... unbreak the build, still
doing the same thing.

diffstat:

 sys/external/bsd/drm2/ttm/ttm_bus_dma.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (30 lines):

diff -r 6bc60c317fe1 -r 9c51ebacfa3f sys/external/bsd/drm2/ttm/ttm_bus_dma.c
--- a/sys/external/bsd/drm2/ttm/ttm_bus_dma.c   Thu Mar 09 07:55:23 2017 +0000
+++ b/sys/external/bsd/drm2/ttm/ttm_bus_dma.c   Thu Mar 09 08:05:21 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ttm_bus_dma.c,v 1.5 2017/03/09 07:55:23 maya Exp $     */
+/*     $NetBSD: ttm_bus_dma.c,v 1.6 2017/03/09 08:05:21 maya Exp $     */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ttm_bus_dma.c,v 1.5 2017/03/09 07:55:23 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttm_bus_dma.c,v 1.6 2017/03/09 08:05:21 maya Exp $");
 
 #include <sys/bus.h>
 
@@ -86,9 +86,9 @@
 
 fail2: __unused
        bus_dmamap_unload(ttm_dma->ttm.bdev->dmat, ttm_dma->dma_address);
-fail1: KASSERT(ttm->state == tt_unbound);
+fail1: KASSERT(ttm_dma->ttm.state == tt_unbound);
        ttm_tt_unwire(&ttm_dma->ttm);
-       ttm->state = tt_unpopulated;
+       ttm_dma->ttm.state = tt_unpopulated;
 fail0: KASSERT(ret);
        return ret;
 }



Home | Main Index | Thread Index | Old Index