[src/trunk]: src/sys/arch/i386/include always include ci_s*_locks in struct c...

[jdolecek <jdolecek%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/68e62b5d9462
branches:  trunk
changeset: 533810:68e62b5d9462
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Tue Jul 09 22:28:30 2002 +0000

description:
always include ci_s*_locks in struct cpu_info, so that the size doesn't depend
on DIAGNOSTIC/LOCKDEBUG settings

diffstat:

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

diffs (20 lines):

diff -r 1a6289bc3e33 -r 68e62b5d9462 sys/arch/i386/include/cpu.h
--- a/sys/arch/i386/include/cpu.h       Tue Jul 09 22:25:06 2002 +0000
+++ b/sys/arch/i386/include/cpu.h       Tue Jul 09 22:28:30 2002 +0000
@@ -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 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];