Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename 'ncpus' to '_ncpus', otherwise we shadow sparc/sparc64's 'ncpus' 

when MULTIPROCESSOR is defined.
This commit is contained in:
jdc 2005-06-05 21:22:20 +00:00
parent d198119b32
commit a406dfbd14
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/kern/kern_sa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_sa.c,v 1.60 2005/03/02 11:05:34 mycroft Exp $ */
/* $NetBSD: kern_sa.c,v 1.61 2005/06/05 21:22:20 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.60 2005/03/02 11:05:34 mycroft Exp $");
__KERNEL_RCSID(0, "$NetBSD: kern_sa.c,v 1.61 2005/06/05 21:22:20 jdc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -541,7 +541,7 @@ sys_sa_setconcurrency(struct lwp *l, void *v, register_t *retval)
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 @@ sys_sa_setconcurrency(struct lwp *l, void *v, register_t *retval)
*/
#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