summaryrefslogtreecommitdiff
path: root/sys/arch/arm
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2010-09-28 20:27:57 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2010-09-28 20:27:57 +0000
commit15969dfa68e37d305dd11968e20ca0a425d2092a (patch)
treeff5f69008da4bbcba278d383b53bb927776d4644 /sys/arch/arm
parent23487e0f53f72934a66dcf7e42b399ec6562e966 (diff)
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@.
Diffstat (limited to 'sys/arch/arm')
-rw-r--r--sys/arch/arm/include/cpu.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/arch/arm/include/cpu.h b/sys/arch/arm/include/cpu.h
index c9475e0a234..145718deec1 100644
--- a/sys/arch/arm/include/cpu.h
+++ b/sys/arch/arm/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.24 2009/03/26 17:24:33 oga Exp $ */
+/* $OpenBSD: cpu.h,v 1.25 2010/09/28 20:27:54 miod Exp $ */
/* $NetBSD: cpu.h,v 1.34 2003/06/23 11:01:08 martin Exp $ */
/*
@@ -208,6 +208,9 @@ struct cpu_info {
u_long ci_spin_locks; /* # of spin locks held */
u_long ci_simple_locks; /* # of simple locks held */
#endif
+#ifdef DIAGNOSTIC
+ int ci_mutex_level;
+#endif
struct device *ci_dev; /* Device corresponding to this CPU */
u_int32_t ci_arm_cpuid; /* aggregate CPU id */
u_int32_t ci_arm_cputype; /* CPU type */