From f4e3c063693adb629d82a948a34398e8b07decb1 Mon Sep 17 00:00:00 2001
From: jdolecek <jdolecek@NetBSD.org>
Date: Tue, 9 Jul 2002 22:28:30 +0000
Subject: [PATCH] always include ci_s*_locks in struct cpu_info, so that the
 size doesn't depend on DIAGNOSTIC/LOCKDEBUG settings

---
 sys/arch/i386/include/cpu.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/sys/arch/i386/include/cpu.h b/sys/arch/i386/include/cpu.h
index cb3a300d536b..bd44a1f67498 100644
--- a/sys/arch/i386/include/cpu.h
+++ b/sys/arch/i386/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.80 2002/05/12 23:16:52 matt Exp $	*/
+/*	$NetBSD: cpu.h,v 1.81 2002/07/09 22:28:30 jdolecek Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -75,10 +75,8 @@ struct i386_cache_info {
 
 struct cpu_info {
 	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
 
 	u_int ci_cflush_lsize;	/* CFLUSH insn line size */
 	struct i386_cache_info ci_cinfo[CAI_COUNT];