Module Name:    src
Committed By:   riastradh
Date:           Wed Jul 24 02:40:57 UTC 2013

Modified Files:
        src/sys/external/bsd/drm2/dist/drm [riastradh-drm2]: drm_stub.c

Log Message:
Adapt drm_master_create to use DRM_INIT_WAITQUEUE.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.5 -r1.1.1.1.2.6 \
    src/sys/external/bsd/drm2/dist/drm/drm_stub.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/drm_stub.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_stub.c:1.1.1.1.2.5 src/sys/external/bsd/drm2/dist/drm/drm_stub.c:1.1.1.1.2.6
--- src/sys/external/bsd/drm2/dist/drm/drm_stub.c:1.1.1.1.2.5	Wed Jul 24 02:40:42 2013
+++ src/sys/external/bsd/drm2/dist/drm/drm_stub.c	Wed Jul 24 02:40:57 2013
@@ -169,7 +169,12 @@ struct drm_master *drm_master_create(str
 
 	kref_init(&master->refcount);
 	spin_lock_init(&master->lock.spinlock);
+#ifdef __NetBSD__
+	DRM_INIT_WAITQUEUE(&master->lock.lock_queue, "drmulckq");
+	DRM_INIT_WAITQUEUE(&master->lock.kernel_lock_queue, "drmklckq");
+#else
 	init_waitqueue_head(&master->lock.lock_queue);
+#endif
 	drm_ht_create(&master->magiclist, DRM_MAGIC_HASH_ORDER);
 	INIT_LIST_HEAD(&master->magicfree);
 	master->minor = minor;

Reply via email to