From 15969dfa68e37d305dd11968e20ca0a425d2092a Mon Sep 17 00:00:00 2001
From: Miod Vallat <miod@cvs.openbsd.org>
Date: Tue, 28 Sep 2010 20:27:57 +0000
Subject: Implement a per-cpu held mutex counter if DIAGNOSTIC on all non-x86
 platforms, to complete matthew@'s commit of a few days ago, and drop
 __HAVE_CPU_MUTEX_LEVEL define. With help from, and ok deraadt@.

---
 sys/arch/sh/include/cpu.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'sys/arch/sh/include/cpu.h')

diff --git a/sys/arch/sh/include/cpu.h b/sys/arch/sh/include/cpu.h
index 7311e10f37f..2963065e1f5 100644
--- a/sys/arch/sh/include/cpu.h
+++ b/sys/arch/sh/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.20 2010/04/25 18:11:36 miod Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.21 2010/09/28 20:27:55 miod Exp $	*/
 /*	$NetBSD: cpu.h,v 1.41 2006/01/21 04:24:12 uwe Exp $	*/
 
 /*-
@@ -62,6 +62,9 @@ struct cpu_info {
 
 	struct schedstate_percpu ci_schedstate; /* scheduler state */
 	u_int32_t ci_randseed;
+#ifdef DIAGNOSTIC
+	int	ci_mutex_level;
+#endif
 };
 
 extern struct cpu_info cpu_info_store;
-- 
cgit v1.2.3