Module Name: src
Committed By: riastradh
Date: Mon Aug 27 14:41:41 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_drv.c
Log Message:
Make mutex destruction match initialization.
>From mrg@.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/drm2/dist/drm/drm_drv.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_drv.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_drv.c:1.8 src/sys/external/bsd/drm2/dist/drm/drm_drv.c:1.9
--- src/sys/external/bsd/drm2/dist/drm/drm_drv.c:1.8 Mon Aug 27 13:42:47 2018
+++ src/sys/external/bsd/drm2/dist/drm/drm_drv.c Mon Aug 27 14:41:41 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_drv.c,v 1.8 2018/08/27 13:42:47 riastradh Exp $ */
+/* $NetBSD: drm_drv.c,v 1.9 2018/08/27 14:41:41 riastradh Exp $ */
/*
* Created: Fri Jan 19 10:48:35 2001 by fa...@acm.org
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.8 2018/08/27 13:42:47 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.9 2018/08/27 14:41:41 riastradh Exp $");
#include <linux/err.h>
#include <linux/export.h>
@@ -732,12 +732,15 @@ err_minors:
drm_fs_inode_free(dev->anon_inode);
err_free:
#ifdef __NetBSD__
- linux_mutex_destroy(&dev->struct_mutex);
- linux_mutex_destroy(&dev->ctxlist_mutex);
linux_mutex_destroy(&dev->master_mutex);
+ linux_mutex_destroy(&dev->ctxlist_mutex);
+ linux_mutex_destroy(&dev->struct_mutex);
spin_lock_destroy(&dev->event_lock);
+ spin_lock_destroy(&dev->buf_lock);
#else
mutex_destroy(&dev->master_mutex);
+ mutex_destroy(&dev->ctxlist_mutex);
+ mutex_destroy(&dev->struct_mutex);
#endif
kfree(dev);
return NULL;
@@ -760,12 +763,15 @@ static void drm_dev_release(struct kref
drm_minor_free(dev, DRM_MINOR_CONTROL);
#ifdef __NetBSD__
- linux_mutex_destroy(&dev->struct_mutex);
- linux_mutex_destroy(&dev->ctxlist_mutex);
linux_mutex_destroy(&dev->master_mutex);
+ linux_mutex_destroy(&dev->ctxlist_mutex);
+ linux_mutex_destroy(&dev->struct_mutex);
spin_lock_destroy(&dev->event_lock);
+ spin_lock_destroy(&dev->buf_lock);
#else
mutex_destroy(&dev->master_mutex);
+ mutex_destroy(&dev->ctxlist_mutex);
+ mutex_destroy(&dev->struct_mutex);
#endif
kfree(dev->unique);
kfree(dev);
