Is this change ok? Kernel modules will need to know if DIAGNOSTIC is
used otherwise.

/Johan

--- cpu.h	2003/02/05 12:16:43	1.60
+++ cpu.h	2003/07/31 11:21:08
@@ -110,10 +110,8 @@
 	 * 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
 	struct lwp *ci_curlwp;		/* current owner of the processor */
 	struct cpu_info *ci_next;	/* next cpu_info structure */