Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:37:17 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/nouveau: nouveau_gem.c
Log Message:
Avoid name clash over LIST_HEAD.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_gem.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_gem.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_gem.c:1.6 src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_gem.c:1.7
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_gem.c:1.6 Mon Aug 27 07:19:01 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_gem.c Mon Aug 27 07:37:17 2018
@@ -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 @@ validate_init(struct nouveau_channel *ch
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:
