Module Name: src
Committed By: riastradh
Date: Tue Apr 19 02:52:29 UTC 2016
Modified Files:
src/sys/external/bsd/drm2/drm: drm_vma_manager.c
Log Message:
Make sure rbtrees are empty on desctruction.
If related to PR kern/51076, might help catch the bug a bit earlier.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/drm/drm_vma_manager.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/drm/drm_vma_manager.c
diff -u src/sys/external/bsd/drm2/drm/drm_vma_manager.c:1.3 src/sys/external/bsd/drm2/drm/drm_vma_manager.c:1.4
--- src/sys/external/bsd/drm2/drm/drm_vma_manager.c:1.3 Fri Jun 19 22:51:57 2015
+++ src/sys/external/bsd/drm2/drm/drm_vma_manager.c Tue Apr 19 02:52:29 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_vma_manager.c,v 1.3 2015/06/19 22:51:57 chs Exp $ */
+/* $NetBSD: drm_vma_manager.c,v 1.4 2016/04/19 02:52:29 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_vma_manager.c,v 1.3 2015/06/19 22:51:57 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_vma_manager.c,v 1.4 2016/04/19 02:52:29 riastradh Exp $");
#include <sys/kmem.h>
#include <sys/rbtree.h>
@@ -120,6 +120,8 @@ drm_vma_offset_manager_destroy(struct dr
{
vmem_destroy(mgr->vom_vmem);
+ KASSERTMSG((RB_TREE_MIN(&mgr->vom_nodes) == NULL),
+ "drm vma offset manager %p not empty", mgr);
#if 0
rb_tree_destroy(&mgr->vom_nodes);
#endif
@@ -143,6 +145,8 @@ void
drm_vma_node_destroy(struct drm_vma_offset_node *node)
{
+ KASSERTMSG((RB_TREE_MIN(&node->von_files) == NULL),
+ "drm vma node %p not empty", node);
#if 0
rb_tree_destroy(&node->von_files);
#endif
