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

Reduce ifdefs due to MULTIPROCESSOR slightly.

Browse Source
This commit is contained in:
ad 2008-05-19 17:06:02 +00:00
parent a14327894a
commit 245f0726ac
18 changed files with 42 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/kern/kern_cctr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_cctr.c,v 1.7 2008/04/28 20:24:02 martin Exp $ */
/* $NetBSD: kern_cctr.c,v 1.8 2008/05/19 17:06:02 ad Exp $ */
/*-
* Copyright (c) 2006, 2008 The NetBSD Foundation, Inc.
@ -75,9 +75,7 @@
#include <sys/cdefs.h>
/* __FBSDID("$FreeBSD: src/sys/i386/i386/tsc.c,v 1.204 2003/10/21 18:28:34 silby Exp $"); */
__KERNEL_RCSID(0, "$NetBSD: kern_cctr.c,v 1.7 2008/04/28 20:24:02 martin Exp $");
#include "opt_multiprocessor.h"
__KERNEL_RCSID(0, "$NetBSD: kern_cctr.c,v 1.8 2008/05/19 17:06:02 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>

10
sys/kern/kern_clock.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_clock.c,v 1.122 2008/04/28 20:24:02 martin Exp $ */
/* $NetBSD: kern_clock.c,v 1.123 2008/05/19 17:06:02 ad Exp $ */
/*-
* Copyright (c) 2000, 2004, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@ -69,10 +69,9 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kern_clock.c,v 1.122 2008/04/28 20:24:02 martin Exp $");
__KERNEL_RCSID(0, "$NetBSD: kern_clock.c,v 1.123 2008/05/19 17:06:02 ad Exp $");
#include "opt_ntp.h"
#include "opt_multiprocessor.h"
#include "opt_perfctrs.h"
#include <sys/param.h>
@ -219,10 +218,7 @@ hardclock(struct clockframe *frame)
if ((--ci->ci_schedstate.spc_ticks) <= 0)
sched_tick(ci);
#if defined(MULTIPROCESSOR)
if (CPU_IS_PRIMARY(ci))
#endif
{
if (CPU_IS_PRIMARY(ci)) {
hardclock_ticks++;
tc_ticktock();
}

18
sys/kern/kern_exit.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_exit.c,v 1.208 2008/04/29 16:21:01 ad Exp $ */
/* $NetBSD: kern_exit.c,v 1.209 2008/05/19 17:06:02 ad Exp $ */
/*-
* Copyright (c) 1998, 1999, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kern_exit.c,v 1.208 2008/04/29 16:21:01 ad Exp $");
__KERNEL_RCSID(0, "$NetBSD: kern_exit.c,v 1.209 2008/05/19 17:06:02 ad Exp $");
#include "opt_ktrace.h"
#include "opt_perfctrs.h"
@ -557,11 +557,7 @@ exit1(struct lwp *l, int rv)
rw_exit(&p->p_reflock);
/* Verify that we hold no locks other than the kernel lock. */
#ifdef MULTIPROCESSOR
LOCKDEBUG_BARRIER(&kernel_lock, 0);
#else
LOCKDEBUG_BARRIER(NULL, 0);
#endif
/*
* NOTE: WE ARE NO LONGER ALLOWED TO SLEEP!
@ -595,9 +591,7 @@ exit_lwps(struct lwp *l)
struct lwp *l2;
int error;
lwpid_t waited;
#if defined(MULTIPROCESSOR)
int nlocks;
#endif
KERNEL_UNLOCK_ALL(l, &nlocks);
@ -644,13 +638,7 @@ exit_lwps(struct lwp *l)
DPRINTF(("exit_lwps: Got LWP %d from lwp_wait1()\n", waited));
}
#if defined(MULTIPROCESSOR)
if (nlocks > 0) {
mutex_exit(p->p_lock);
KERNEL_LOCK(nlocks, l);
mutex_enter(p->p_lock);
}
#endif /* defined(MULTIPROCESSOR) */
KERNEL_LOCK(nlocks, l);
KASSERT(p->p_nlwps == 1);
}

5
sys/kern/kern_fork.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_fork.c,v 1.163 2008/04/28 20:24:03 martin Exp $ */
/* $NetBSD: kern_fork.c,v 1.164 2008/05/19 17:06:02 ad Exp $ */
/*-
* Copyright (c) 1999, 2001, 2004, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@ -67,10 +67,9 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kern_fork.c,v 1.163 2008/04/28 20:24:03 martin Exp $");
__KERNEL_RCSID(0, "$NetBSD: kern_fork.c,v 1.164 2008/05/19 17:06:02 ad Exp $");
#include "opt_ktrace.h"
#include "opt_multiprocessor.h"
#include <sys/param.h>
#include <sys/systm.h>

6
sys/kern/kern_lock.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_lock.c,v 1.141 2008/05/06 17:11:45 ad Exp $ */
/* $NetBSD: kern_lock.c,v 1.142 2008/05/19 17:06:02 ad Exp $ */
/*-
* Copyright (c) 2002, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@ -31,9 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kern_lock.c,v 1.141 2008/05/06 17:11:45 ad Exp $");
#include "opt_multiprocessor.h"
__KERNEL_RCSID(0, "$NetBSD: kern_lock.c,v 1.142 2008/05/19 17:06:02 ad Exp $");
#include <sys/param.h>
#include <sys/proc.h>

11
sys/kern/kern_lwp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_lwp.c,v 1.110 2008/05/06 18:40:57 ad Exp $ */
/* $NetBSD: kern_lwp.c,v 1.111 2008/05/19 17:06:02 ad Exp $ */
/*-
* Copyright (c) 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@ -198,10 +198,9 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kern_lwp.c,v 1.110 2008/05/06 18:40:57 ad Exp $");
__KERNEL_RCSID(0, "$NetBSD: kern_lwp.c,v 1.111 2008/05/19 17:06:02 ad Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
#include "opt_lockdebug.h"
#define _LWP_API_PRIVATE
@ -697,11 +696,7 @@ lwp_exit(struct lwp *l)
/*
* Verify that we hold no locks other than the kernel lock.
*/
#ifdef MULTIPROCESSOR
LOCKDEBUG_BARRIER(&kernel_lock, 0);
#else
LOCKDEBUG_BARRIER(NULL, 0);
#endif
/*
* If we are the last live LWP in a process, we need to exit the
@ -1655,7 +1650,7 @@ lwp_ctl_alloc(vaddr_t *uaddr)
mutex_exit(&lp->lp_lock);
KPREEMPT_DISABLE(l);
l->l_lwpctl->lc_curcpu = (short)curcpu()->ci_data.cpu_index;
l->l_lwpctl->lc_curcpu = (int)curcpu()->ci_data.cpu_index;
KPREEMPT_ENABLE(l);
return 0;

6
sys/kern/kern_mutex.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_mutex.c,v 1.40 2008/05/06 17:11:45 ad Exp $ */
/* $NetBSD: kern_mutex.c,v 1.41 2008/05/19 17:06:02 ad Exp $ */
/*-
* Copyright (c) 2002, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@ -40,9 +40,7 @@
#define __MUTEX_PRIVATE
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kern_mutex.c,v 1.40 2008/05/06 17:11:45 ad Exp $");
#include "opt_multiprocessor.h"
__KERNEL_RCSID(0, "$NetBSD: kern_mutex.c,v 1.41 2008/05/19 17:06:02 ad Exp $");
#include <sys/param.h>
#include <sys/proc.h>

6
sys/kern/kern_proc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_proc.c,v 1.141 2008/05/03 05:36:02 yamt Exp $ */
/* $NetBSD: kern_proc.c,v 1.142 2008/05/19 17:06:02 ad Exp $ */
/*-
* Copyright (c) 1999, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@ -62,12 +62,10 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.141 2008/05/03 05:36:02 yamt Exp $");
__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.142 2008/05/19 17:06:02 ad Exp $");
#include "opt_kstack.h"
#include "opt_maxuprc.h"
#include "opt_multiprocessor.h"
#include "opt_lockdebug.h"
#include <sys/param.h>
#include <sys/systm.h>

7
sys/kern/kern_runq.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_runq.c,v 1.4 2008/05/19 12:48:54 rmind Exp $ */
/* $NetBSD: kern_runq.c,v 1.5 2008/05/19 17:06:02 ad Exp $ */
/*
* Copyright (c) 2007, 2008 Mindaugas Rasiukevicius <rmind at NetBSD org>
@ -27,13 +27,10 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kern_runq.c,v 1.4 2008/05/19 12:48:54 rmind Exp $");
#include "opt_multiprocessor.h"
__KERNEL_RCSID(0, "$NetBSD: kern_runq.c,v 1.5 2008/05/19 17:06:02 ad Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/bitops.h>
#include <sys/cpu.h>
#include <sys/idle.h>

6
sys/kern/kern_rwlock.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_rwlock.c,v 1.23 2008/05/06 17:11:45 ad Exp $ */
/* $NetBSD: kern_rwlock.c,v 1.24 2008/05/19 17:06:02 ad Exp $ */
/*-
* Copyright (c) 2002, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@ -38,9 +38,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kern_rwlock.c,v 1.23 2008/05/06 17:11:45 ad Exp $");
#include "opt_multiprocessor.h"
__KERNEL_RCSID(0, "$NetBSD: kern_rwlock.c,v 1.24 2008/05/19 17:06:02 ad Exp $");
#define __RWLOCK_PRIVATE

7
sys/kern/kern_sig.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_sig.c,v 1.283 2008/04/29 15:55:24 ad Exp $ */
/* $NetBSD: kern_sig.c,v 1.284 2008/05/19 17:06:02 ad Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@ -66,10 +66,9 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.283 2008/04/29 15:55:24 ad Exp $");
__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.284 2008/05/19 17:06:02 ad Exp $");
#include "opt_ptrace.h"
#include "opt_multiprocessor.h"
#include "opt_compat_sunos.h"
#include "opt_compat_netbsd.h"
#include "opt_compat_netbsd32.h"
@ -1457,9 +1456,7 @@ sigswitch(bool ppsig, int ppmask, int signo)
{
struct lwp *l = curlwp;
struct proc *p = l->l_proc;
#ifdef MULTIPROCESSOR
int biglocks;
#endif
KASSERT(mutex_owned(p->p_lock));
KASSERT(l->l_stat == LSONPROC);

6
sys/kern/kern_synch.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_synch.c,v 1.242 2008/05/19 12:48:54 rmind Exp $ */
/* $NetBSD: kern_synch.c,v 1.243 2008/05/19 17:06:02 ad Exp $ */
/*-
* Copyright (c) 1999, 2000, 2004, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@ -68,11 +68,9 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.242 2008/05/19 12:48:54 rmind Exp $");
__KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.243 2008/05/19 17:06:02 ad Exp $");
#include "opt_kstack.h"
#include "opt_lockdebug.h"
#include "opt_multiprocessor.h"
#include "opt_perfctrs.h"
#define __MUTEX_PRIVATE

5
sys/kern/subr_autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: subr_autoconf.c,v 1.147 2008/04/29 14:35:21 rmind Exp $ */
/* $NetBSD: subr_autoconf.c,v 1.148 2008/05/19 17:06:02 ad Exp $ */
/*
* Copyright (c) 1996, 2000 Christopher G. Demetriou
@ -77,9 +77,8 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.147 2008/04/29 14:35:21 rmind Exp $");
__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.148 2008/05/19 17:06:02 ad Exp $");
#include "opt_multiprocessor.h"
#include "opt_ddb.h"
#include <sys/param.h>

5
sys/kern/subr_prf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: subr_prf.c,v 1.121 2008/05/13 11:54:45 ad Exp $ */
/* $NetBSD: subr_prf.c,v 1.122 2008/05/19 17:06:02 ad Exp $ */
/*-
* Copyright (c) 1986, 1988, 1991, 1993
@ -37,12 +37,11 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: subr_prf.c,v 1.121 2008/05/13 11:54:45 ad Exp $");
__KERNEL_RCSID(0, "$NetBSD: subr_prf.c,v 1.122 2008/05/19 17:06:02 ad Exp $");
#include "opt_ddb.h"
#include "opt_ipkdb.h"
#include "opt_kgdb.h"
#include "opt_multiprocessor.h"
#include "opt_dump.h"
#include <sys/param.h>

5
sys/kern/vnode_if.sh
View File

@ -29,7 +29,7 @@ copyright="\
* SUCH DAMAGE.
*/
"
SCRIPT_ID='$NetBSD: vnode_if.sh,v 1.48 2008/01/02 11:48:57 ad Exp $'
SCRIPT_ID='$NetBSD: vnode_if.sh,v 1.49 2008/05/19 17:06:02 ad Exp $'
# Script to produce VFS front-end sugar.
#
@ -258,8 +258,7 @@ __KERNEL_RCSID(0, \"\$NetBSD\$\");
"
echo '
#include "opt_vnode_lockdebug.h"
#include "opt_multiprocessor.h"'
#include "opt_vnode_lockdebug.h"'
echo '
#include <sys/param.h>
#include <sys/mount.h>

6
sys/sys/cpu.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: cpu.h,v 1.21 2008/04/30 12:44:27 ad Exp $ */
/* $NetBSD: cpu.h,v 1.22 2008/05/19 17:06:02 ad Exp $ */
/*-
* Copyright (c) 2007 YAMAMOTO Takashi,
@ -62,6 +62,10 @@ void cpu_need_resched(struct cpu_info *, int);
(void)cii, ci = curcpu(); ci != NULL; ci = NULL
#endif
#ifndef CPU_IS_PRIMARY
#define CPU_IS_PRIMARY(ci) ((void)ci, 1)
#endif
#ifdef __HAVE_MD_CPU_OFFLINE
void cpu_offline_md(void);
#endif

7
sys/sys/sleepq.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: sleepq.h,v 1.11 2008/04/28 20:24:11 martin Exp $ */
/* $NetBSD: sleepq.h,v 1.12 2008/05/19 17:06:02 ad Exp $ */
/*-
* Copyright (c) 2002, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@ -32,11 +32,6 @@
#ifndef _SYS_SLEEPQ_H_
#define _SYS_SLEEPQ_H_
#ifdef _KERNEL_OPT
#include "opt_multiprocessor.h"
#include "opt_lockdebug.h"
#endif
#include <sys/queue.h>
#include <sys/mutex.h>
#include <sys/sched.h>

6
sys/sys/systm.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: systm.h,v 1.223 2008/05/05 17:11:17 ad Exp $ */
/* $NetBSD: systm.h,v 1.224 2008/05/19 17:06:02 ad Exp $ */
/*-
* Copyright (c) 1982, 1988, 1991, 1993
@ -471,8 +471,8 @@ do { \
} while (/* CONSTCOND */ 0)
#define KERNEL_UNLOCK(all, lwp, p) _kernel_unlock((all), (p))
#else
#define KERNEL_LOCK(count, lwp) /* nothing */
#define KERNEL_UNLOCK(all, lwp, ptr) /* nothing */
#define KERNEL_LOCK(count, lwp) ((void)count, (void)lwp)
#define KERNEL_UNLOCK(all, lwp, ptr) ((void)all, (void)lwp, (void)ptr)
#endif
#define KERNEL_UNLOCK_LAST(l) KERNEL_UNLOCK(-1, (l), NULL)