Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/external/bsd/drm2/dist/drm/nouveau/core/core fix non-deb...



details:   https://anonhg.NetBSD.org/src/rev/5d5c060a6ad6
branches:  trunk
changeset: 341106:5d5c060a6ad6
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun Oct 18 14:49:24 2015 +0000

description:
fix non-debug build

diffstat:

 sys/external/bsd/drm2/dist/drm/nouveau/core/core/nouveau_core_object.c |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (37 lines):

diff -r 4fe0cc93c703 -r 5d5c060a6ad6 sys/external/bsd/drm2/dist/drm/nouveau/core/core/nouveau_core_object.c
--- a/sys/external/bsd/drm2/dist/drm/nouveau/core/core/nouveau_core_object.c    Sun Oct 18 14:31:33 2015 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/core/core/nouveau_core_object.c    Sun Oct 18 14:49:24 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nouveau_core_object.c,v 1.2 2014/08/06 13:35:13 riastradh Exp $        */
+/*     $NetBSD: nouveau_core_object.c,v 1.3 2015/10/18 14:49:24 jmcneill Exp $ */
 
 /*
  * Copyright 2012 Red Hat Inc.
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_core_object.c,v 1.2 2014/08/06 13:35:13 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_core_object.c,v 1.3 2015/10/18 14:49:24 jmcneill Exp $");
 
 #include <core/object.h>
 #include <core/parent.h>
@@ -47,14 +47,18 @@
 nouveau_objects_init(void)
 {
 
+#ifdef NOUVEAU_OBJECT_MAGIC
        spin_lock_init(&_objlist_lock);
+#endif
 }
 
 void
 nouveau_objects_fini(void)
 {
 
+#ifdef NOUVEAU_OBJECT_MAGIC
        spin_lock_destroy(&_objlist_lock);
+#endif
 }
 #endif
 



Home | Main Index | Thread Index | Old Index