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/dist/drm/nouveau Avoid name clash over...



details:   https://anonhg.NetBSD.org/src/rev/5e12cb9c80c9
branches:  trunk
changeset: 835111:5e12cb9c80c9
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 07:37:17 2018 +0000

description:
Avoid name clash over LIST_HEAD.

diffstat:

 sys/external/bsd/drm2/dist/drm/nouveau/nouveau_gem.c |  12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diffs (33 lines):

diff -r e2e26dc66d3a -r 5e12cb9c80c9 sys/external/bsd/drm2/dist/drm/nouveau/nouveau_gem.c
--- a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_gem.c      Mon Aug 27 07:37:07 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_gem.c      Mon Aug 27 07:37:17 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nouveau_gem.c,v 1.6 2018/08/27 07:19:01 riastradh Exp $        */
+/*     $NetBSD: nouveau_gem.c,v 1.7 2018/08/27 07:37:17 riastradh Exp $        */
 
 /*
  * Copyright (C) 2008 Ben Skeggs.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_gem.c,v 1.6 2018/08/27 07:19:01 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_gem.c,v 1.7 2018/08/27 07:37:17 riastradh Exp $");
 
 #include <linux/err.h>         /* XXX */
 
@@ -383,9 +383,11 @@
        int trycnt = 0;
        int ret = -EINVAL, i;
        struct nouveau_bo *res_bo = NULL;
-       LIST_HEAD(gart_list);
-       LIST_HEAD(vram_list);
-       LIST_HEAD(both_list);
+       struct list_head gart_list, vram_list, both_list;
+
+       INIT_LIST_HEAD(&gart_list);
+       INIT_LIST_HEAD(&vram_list);
+       INIT_LIST_HEAD(&both_list);
 
        ww_acquire_init(&op->ticket, &reservation_ww_class);
 retry:



Home | Main Index | Thread Index | Old Index