[src/trunk]: src/sys/kern Revert previous ('_ncpus' is now 'ncpus' again).

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

details:   https://anonhg.NetBSD.org/src/rev/39e04757643d
branches:  trunk
changeset: 581823:39e04757643d
user:      jdc <jdc%NetBSD.org@localhost>
date:      Mon Jun 06 19:56:46 2005 +0000

description:
Revert previous ('_ncpus' is now 'ncpus' again).
MI variable names have precedence.

diffstat:

 sys/kern/init_sysctl.c |  10 +++++-----
 sys/kern/kern_sa.c     |  12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diffs (74 lines):

diff -r a1b4ecb4dbe9 -r 39e04757643d sys/kern/init_sysctl.c
--- a/sys/kern/init_sysctl.c    Mon Jun 06 17:10:25 2005 +0000
+++ b/sys/kern/init_sysctl.c    Mon Jun 06 19:56:46 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: init_sysctl.c,v 1.41 2005/06/05 09:04:49 jdc Exp $ */
+/*     $NetBSD: init_sysctl.c,v 1.42 2005/06/06 19:56:46 jdc Exp $ */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_sysctl.c,v 1.41 2005/06/05 09:04:49 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_sysctl.c,v 1.42 2005/06/06 19:56:46 jdc Exp $");
 
 #include "opt_sysv.h"
 #include "opt_multiprocessor.h"
@@ -106,10 +106,10 @@
        struct cpu_info *ci;
        CPU_INFO_ITERATOR cii;
 
-       int _ncpus = 0;
+       int ncpus = 0;
        for (CPU_INFO_FOREACH(cii, ci))
-               _ncpus++;
-       return (_ncpus);
+               ncpus++;
+       return (ncpus);
 }
 #endif /* MULTIPROCESSOR */
 
diff -r a1b4ecb4dbe9 -r 39e04757643d sys/kern/kern_sa.c
--- a/sys/kern/kern_sa.c        Mon Jun 06 17:10:25 2005 +0000
+++ b/sys/kern/kern_sa.c        Mon Jun 06 19:56:46 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_sa.c,v 1.61 2005/06/05 21:22:20 jdc Exp $ */
+/*     $NetBSD: kern_sa.c,v 1.62 2005/06/06 19:56:46 jdc Exp $ */
 
 /*-
  * Copyright (c) 2001, 2004, 2005 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_sa.c,v 1.61 2005/06/05 21:22:20 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sa.c,v 1.62 2005/06/06 19:56:46 jdc Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -541,7 +541,7 @@
        struct sadata *sa = l->l_proc->p_sa;
 #ifdef MULTIPROCESSOR
        struct sadata_vp *vp = l->l_savp;
-       int _ncpus, s;
+       int ncpus, s;
        struct cpu_info *ci;
        CPU_INFO_ITERATOR cii;
 #endif
@@ -565,11 +565,11 @@
         */
 #ifdef MULTIPROCESSOR
        if (SCARG(uap, concurrency) > sa->sa_maxconcurrency) {
-               _ncpus = 0;
+               ncpus = 0;
                for (CPU_INFO_FOREACH(cii, ci))
-                       _ncpus++;
+                       ncpus++;
                *retval += sa_increaseconcurrency(l,
-                   min(SCARG(uap, concurrency), _ncpus));
+                   min(SCARG(uap, concurrency), ncpus));
        }
 #endif