Module Name: src
Committed By: riastradh
Date: Fri Feb 14 04:38:48 UTC 2020
Modified Files:
src/sys/external/bsd/common/include/linux: list.h
src/sys/external/bsd/drm2/dist/drm: drm_edid.c
src/sys/external/bsd/drm2/dist/drm/nouveau: nouveau_drm.c nouveau_gem.c
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/timer:
nouveau_nvkm_subdev_timer_base.c
src/sys/external/bsd/drm2/include/linux: nbsd-namespace.h
Log Message:
Add LIST_HEAD to <linux/nbsd-namespace.h> too.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/external/bsd/common/include/linux/list.h
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/dist/drm/drm_edid.c
cvs rdiff -u -r1.18 -r1.19 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.c
cvs rdiff -u -r1.9 -r1.10 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_gem.c
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/timer/nouveau_nvkm_subdev_timer_base.c
cvs rdiff -u -r1.1 -r1.2 \
src/sys/external/bsd/drm2/include/linux/nbsd-namespace.h
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/common/include/linux/list.h
diff -u src/sys/external/bsd/common/include/linux/list.h:1.18 src/sys/external/bsd/common/include/linux/list.h:1.19
--- src/sys/external/bsd/common/include/linux/list.h:1.18 Mon Aug 27 13:56:58 2018
+++ src/sys/external/bsd/common/include/linux/list.h Fri Feb 14 04:38:48 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: list.h,v 1.18 2018/08/27 13:56:58 riastradh Exp $ */
+/* $NetBSD: list.h,v 1.19 2020/02/14 04:38:48 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -61,6 +61,8 @@ struct list_head {
#define LIST_HEAD_INIT(name) { .prev = &(name), .next = &(name) }
+#define LINUX_LIST_HEAD(name) struct list_head name = LIST_HEAD_INIT(name)
+
static inline void
INIT_LIST_HEAD(struct list_head *head)
{
Index: src/sys/external/bsd/drm2/dist/drm/drm_edid.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_edid.c:1.6 src/sys/external/bsd/drm2/dist/drm/drm_edid.c:1.7
--- src/sys/external/bsd/drm2/dist/drm/drm_edid.c:1.6 Mon Aug 27 04:58:19 2018
+++ src/sys/external/bsd/drm2/dist/drm/drm_edid.c Fri Feb 14 04:38:48 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_edid.c,v 1.6 2018/08/27 04:58:19 riastradh Exp $ */
+/* $NetBSD: drm_edid.c,v 1.7 2020/02/14 04:38:48 riastradh Exp $ */
/*
* Copyright (c) 2006 Luc Verhaegen (quirks list)
@@ -30,7 +30,7 @@
* DEALINGS IN THE SOFTWARE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_edid.c,v 1.6 2018/08/27 04:58:19 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_edid.c,v 1.7 2020/02/14 04:38:48 riastradh Exp $");
#include <linux/kernel.h>
#include <linux/slab.h>
@@ -48,6 +48,8 @@ __KERNEL_RCSID(0, "$NetBSD: drm_edid.c,v
#include <drm/drm_edid.h>
#include <drm/drm_displayid.h>
+#include <linux/nbsd-namespace.h>
+
#define version_greater(edid, maj, min) \
(((edid)->version > (maj)) || \
((edid)->version == (maj) && (edid)->revision > (min)))
@@ -2673,7 +2675,7 @@ add_alternate_cea_modes(struct drm_conne
{
struct drm_device *dev = connector->dev;
struct drm_display_mode *mode, *tmp;
- struct list_head list = LIST_HEAD_INIT(list);
+ LIST_HEAD(list);
int modes = 0;
/* Don't add CEA modes if the CEA extension block is missing */
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.c:1.18 src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.c:1.19
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.c:1.18 Fri Feb 14 04:35:20 2020
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.c Fri Feb 14 04:38:48 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_drm.c,v 1.18 2020/02/14 04:35:20 riastradh Exp $ */
+/* $NetBSD: nouveau_drm.c,v 1.19 2020/02/14 04:38:48 riastradh Exp $ */
/*
* Copyright 2012 Red Hat Inc.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_drm.c,v 1.18 2020/02/14 04:35:20 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_drm.c,v 1.19 2020/02/14 04:38:48 riastradh Exp $");
#include <linux/console.h>
#include <linux/delay.h>
@@ -61,7 +61,11 @@ __KERNEL_RCSID(0, "$NetBSD: nouveau_drm.
#include "nouveau_platform.h"
#include "nouveau_ttm.h"
+#ifdef __NetBSD__
+#include <sys/file.h>
+#include <sys/ioccom.h>
#include <linux/nbsd-namespace.h>
+#endif
MODULE_PARM_DESC(config, "option string to pass to driver core");
char *nouveau_config;
@@ -949,8 +953,6 @@ nouveau_ioctls[] = {
};
#ifdef __NetBSD__
-#include <sys/file.h>
-#include <sys/ioccom.h>
static int /* XXX expose to ioc32 */
nouveau_ioctl_override(struct file *fp, unsigned long cmd, void *data)
{
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.9 src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_gem.c:1.10
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_gem.c:1.9 Sun Jan 27 02:08:42 2019
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_gem.c Fri Feb 14 04:38:48 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_gem.c,v 1.9 2019/01/27 02:08:42 pgoyette Exp $ */
+/* $NetBSD: nouveau_gem.c,v 1.10 2020/02/14 04:38:48 riastradh Exp $ */
/*
* Copyright (C) 2008 Ben Skeggs.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_gem.c,v 1.9 2019/01/27 02:08:42 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_gem.c,v 1.10 2020/02/14 04:38:48 riastradh Exp $");
#include <linux/err.h> /* XXX */
@@ -39,6 +39,8 @@ __KERNEL_RCSID(0, "$NetBSD: nouveau_gem.
#include "nouveau_ttm.h"
#include "nouveau_gem.h"
+#include <linux/nbsd-namespace.h>
+
void
nouveau_gem_object_del(struct drm_gem_object *gem)
{
@@ -381,11 +383,9 @@ validate_init(struct nouveau_channel *ch
int trycnt = 0;
int ret = -EINVAL, i;
struct nouveau_bo *res_bo = NULL;
- struct list_head gart_list, vram_list, both_list;
-
- INIT_LIST_HEAD(&gart_list);
- INIT_LIST_HEAD(&vram_list);
- INIT_LIST_HEAD(&both_list);
+ LIST_HEAD(gart_list);
+ LIST_HEAD(vram_list);
+ LIST_HEAD(both_list);
ww_acquire_init(&op->ticket, &reservation_ww_class);
retry:
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/timer/nouveau_nvkm_subdev_timer_base.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/timer/nouveau_nvkm_subdev_timer_base.c:1.2 src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/timer/nouveau_nvkm_subdev_timer_base.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/timer/nouveau_nvkm_subdev_timer_base.c:1.2 Mon Aug 27 04:58:35 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/timer/nouveau_nvkm_subdev_timer_base.c Fri Feb 14 04:38:48 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_nvkm_subdev_timer_base.c,v 1.2 2018/08/27 04:58:35 riastradh Exp $ */
+/* $NetBSD: nouveau_nvkm_subdev_timer_base.c,v 1.3 2020/02/14 04:38:48 riastradh Exp $ */
/*
* Copyright 2012 Red Hat Inc.
@@ -24,10 +24,12 @@
* Authors: Ben Skeggs
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_subdev_timer_base.c,v 1.2 2018/08/27 04:58:35 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_subdev_timer_base.c,v 1.3 2020/02/14 04:38:48 riastradh Exp $");
#include "priv.h"
+#include <linux/nbsd-namespace.h>
+
u64
nvkm_timer_read(struct nvkm_timer *tmr)
{
@@ -39,7 +41,7 @@ nvkm_timer_alarm_trigger(struct nvkm_tim
{
struct nvkm_alarm *alarm, *atemp;
unsigned long flags;
- struct list_head exec = LIST_HEAD_INIT(exec);
+ LIST_HEAD(exec);
/* Process pending alarms. */
spin_lock_irqsave(&tmr->lock, flags);
Index: src/sys/external/bsd/drm2/include/linux/nbsd-namespace.h
diff -u src/sys/external/bsd/drm2/include/linux/nbsd-namespace.h:1.1 src/sys/external/bsd/drm2/include/linux/nbsd-namespace.h:1.2
--- src/sys/external/bsd/drm2/include/linux/nbsd-namespace.h:1.1 Fri Feb 14 04:35:20 2020
+++ src/sys/external/bsd/drm2/include/linux/nbsd-namespace.h Fri Feb 14 04:38:48 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nbsd-namespace.h,v 1.1 2020/02/14 04:35:20 riastradh Exp $ */
+/* $NetBSD: nbsd-namespace.h,v 1.2 2020/02/14 04:38:48 riastradh Exp $ */
/*-
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -36,8 +36,10 @@
*/
#undef ALIGN
+#undef LIST_HEAD
#define ALIGN round_up
+#define LIST_HEAD LINUX_LIST_HEAD
#define mutex_destroy linux_mutex_destroy
#define mutex_init linux_mutex_init
