remove counters for simplelocks

6 files changed, 6 insertions, 28 deletions

diff --git a/sys/arch/alpha/include/cpu.h b/sys/arch/alpha/include/cpu.h
index d43c510d202..8f9e454e4a4 100644
--- a/sys/arch/alpha/include/cpu.h
+++ b/sys/arch/alpha/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.49 2013/03/12 09:37:16 mpi Exp $ */
+/* $OpenBSD: cpu.h,v 1.50 2013/05/31 17:00:57 tedu Exp $ */
 /* $NetBSD: cpu.h,v 1.45 2000/08/21 02:03:12 thorpej Exp $ */
 
 /*-
@@ -174,10 +174,6 @@ struct cpu_info {
 	 * Public members.
 	 */
 	struct schedstate_percpu ci_schedstate;	/* scheduler state */
-#if defined(DIAGNOSTIC) || defined(LOCKDEBUG)
-	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
diff --git a/sys/arch/arm/include/cpu.h b/sys/arch/arm/include/cpu.h
index 5da7d8333bc..5dac9ac0578 100644
--- a/sys/arch/arm/include/cpu.h
+++ b/sys/arch/arm/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.34 2013/03/12 09:37:16 mpi Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.35 2013/05/31 17:00:58 tedu Exp $	*/
 /*	$NetBSD: cpu.h,v 1.34 2003/06/23 11:01:08 martin Exp $	*/
 
 /*
@@ -182,10 +182,6 @@ struct cpu_info {
 	struct proc *ci_curproc;
 
 	struct schedstate_percpu ci_schedstate; /* scheduler state */
-#if defined(DIAGNOSTIC) || defined(LOCKDEBUG)
-	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
diff --git a/sys/arch/hppa64/include/cpu.h b/sys/arch/hppa64/include/cpu.h
index 67d59334080..d40f8ea105b 100644
--- a/sys/arch/hppa64/include/cpu.h
+++ b/sys/arch/hppa64/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.32 2013/03/23 16:12:22 deraadt Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.33 2013/05/31 17:00:58 tedu Exp $	*/
 
 /*
  * Copyright (c) 2005 Michael Shalayeff
@@ -97,10 +97,6 @@ struct cpu_info {
 	struct schedstate_percpu ci_schedstate;	/* scheduler state */
 	u_int32_t	ci_randseed;
 
-	/* DEBUG/DIAGNOSTIC stuff */
-	u_long		ci_spin_locks;  /* # of spin locks held */
-	u_long		ci_simple_locks;/* # of simple locks held */
-
 	/* Spinning up the CPU */
 	void		(*ci_spinup)(void); /* spinup routine */
 	void		*ci_initstack;
diff --git a/sys/arch/i386/include/cpu.h b/sys/arch/i386/include/cpu.h
index e28cfdac825..e4415ec3cb4 100644
--- a/sys/arch/i386/include/cpu.h
+++ b/sys/arch/i386/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.129 2013/03/31 17:07:03 deraadt Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.130 2013/05/31 17:00:58 tedu Exp $	*/
 /*	$NetBSD: cpu.h,v 1.35 1996/05/05 19:29:26 christos Exp $	*/
 
 /*-
@@ -85,10 +85,6 @@ struct cpu_info {
 	struct simplelock ci_slock;	/* lock on this data structure */
 	cpuid_t ci_cpuid; 		/* our CPU ID */
 	u_int ci_apicid;		/* our APIC ID */
-#if defined(DIAGNOSTIC) || defined(LOCKDEBUG)
-	u_long ci_spin_locks;		/* # of spin locks held */
-	u_long ci_simple_locks;		/* # of simple locks held */
-#endif
 	u_int32_t ci_randseed;
 
 	/*
diff --git a/sys/arch/m88k/include/cpu.h b/sys/arch/m88k/include/cpu.h
index a9c7089d92d..9a68254a86f 100644
--- a/sys/arch/m88k/include/cpu.h
+++ b/sys/arch/m88k/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.59 2013/03/12 09:37:16 mpi Exp $ */
+/*	$OpenBSD: cpu.h,v 1.60 2013/05/31 17:00:58 tedu Exp $ */
 /*
  * Copyright (c) 1996 Nivas Madhur
  * Copyright (c) 1992, 1993
@@ -145,8 +145,6 @@ struct cpu_info {
 
 	u_int		 ci_intrdepth;		/* interrupt depth */
 
-	u_long		 ci_spin_locks;		/* spin locks counter */
-
 	int		 ci_ddb_state;		/* ddb status */
 #define	CI_DDB_RUNNING	0
 #define	CI_DDB_ENTERDDB	1
diff --git a/sys/arch/sparc64/include/cpu.h b/sys/arch/sparc64/include/cpu.h
index e1bca2f7fa1..c99919f8902 100644
--- a/sys/arch/sparc64/include/cpu.h
+++ b/sys/arch/sparc64/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.82 2013/03/12 09:37:16 mpi Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.83 2013/05/31 17:00:59 tedu Exp $	*/
 /*	$NetBSD: cpu.h,v 1.28 2001/06/14 22:56:58 thorpej Exp $ */
 
 /*
@@ -129,10 +129,6 @@ struct cpu_info {
 	u_int64_t		ci_tick;
 	struct intrhand		ci_tickintr;
 
-	/* DEBUG/DIAGNOSTIC stuff */
-	u_long			ci_spin_locks;	/* # of spin locks held */
-	u_long			ci_simple_locks;/* # of simple locks held */
-
 	/* Spinning up the CPU */
 	void			(*ci_spinup)(void); /* spinup routine */
 	void			*ci_initstack;