From 6c8d3fba22f2500d4e469f9e4da186ed67ddd6bf Mon Sep 17 00:00:00 2001 From: pk Date: Sat, 7 Dec 2002 10:27:03 +0000 Subject: [PATCH] Use MI versions of {set,rem}runqueue(). --- sys/arch/sparc/conf/files.sparc | 3 +- sys/arch/sparc/include/types.h | 3 +- sys/arch/sparc/sparc/locore2.c | 101 -------------------------------- 3 files changed, 2 insertions(+), 105 deletions(-) delete mode 100644 sys/arch/sparc/sparc/locore2.c diff --git a/sys/arch/sparc/conf/files.sparc b/sys/arch/sparc/conf/files.sparc index de2caf6ca690..d1124b5c2059 100644 --- a/sys/arch/sparc/conf/files.sparc +++ b/sys/arch/sparc/conf/files.sparc @@ -1,4 +1,4 @@ -# $NetBSD: files.sparc,v 1.121 2002/10/26 13:50:45 jdolecek Exp $ +# $NetBSD: files.sparc,v 1.122 2002/12/07 10:27:03 pk Exp $ # @(#)files.sparc 8.1 (Berkeley) 7/19/93 # sparc-specific configuration info @@ -286,7 +286,6 @@ file arch/sparc/sparc/intr.c file arch/sparc/sparc/kgdb_machdep.c kgdb # sparc/sparc/locore.s is handled specially in the makefile, # because it must come first in the "ld" command line. -file arch/sparc/sparc/locore2.c file arch/sparc/sparc/machdep.c file arch/sparc/sparc/process_machdep.c file arch/sparc/sparc/mem.c diff --git a/sys/arch/sparc/include/types.h b/sys/arch/sparc/include/types.h index f2baf0eef2da..22b0251c2ee7 100644 --- a/sys/arch/sparc/include/types.h +++ b/sys/arch/sparc/include/types.h @@ -1,4 +1,4 @@ -/* $NetBSD: types.h,v 1.30 2002/10/07 13:26:56 martin Exp $ */ +/* $NetBSD: types.h,v 1.31 2002/12/07 10:27:04 pk Exp $ */ /* * Copyright (c) 1992, 1993 @@ -92,7 +92,6 @@ typedef paddr_t psize_t; #define __HAVE_DEVICE_REGISTER #define __HAVE_GENERIC_SOFT_INTERRUPTS -#define __HAVE_MD_RUNQUEUE #ifdef SUN4U #define __HAVE_CPU_COUNTER /* sparc64 has %tick */ diff --git a/sys/arch/sparc/sparc/locore2.c b/sys/arch/sparc/sparc/locore2.c deleted file mode 100644 index 220018571b86..000000000000 --- a/sys/arch/sparc/sparc/locore2.c +++ /dev/null @@ -1,101 +0,0 @@ -/* $NetBSD: locore2.c,v 1.9 2000/05/26 21:20:18 thorpej Exp $ */ - -/* - * Copyright (c) 1992, 1993 - * The Regents of the University of California. All rights reserved. - * - * This software was developed by the Computer Systems Engineering group - * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and - * contributed to Berkeley. - * - * All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Lawrence Berkeley Laboratory. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)locore2.c 8.4 (Berkeley) 12/10/93 - */ - -/* - * Primitives which are in locore.s on other machines, - * but which have no reason to be assembly-coded on SPARC. - */ - -#include -#include -#include -#include -#include - -#include - -/* - * Put process p on the run queue indicated by its priority. - * Calls should be made at splstatclock(), and p->p_stat should be SRUN. - */ -void -setrunqueue(p) - register struct proc *p; -{ - register struct prochd *q; - register struct proc *oldlast; - register int which = p->p_priority >> 2; - - if (p->p_back != NULL) - panic("setrunqueue"); - q = &sched_qs[which]; - sched_whichqs |= 1 << which; - p->p_forw = (struct proc *)q; - p->p_back = oldlast = q->ph_rlink; - q->ph_rlink = p; - oldlast->p_forw = p; -} - -/* - * Remove process p from its run queue, which should be the one - * indicated by its priority. Calls should be made at splstatclock(). - */ -void -remrunqueue(p) - register struct proc *p; -{ - register int which = p->p_priority >> 2; - register struct prochd *q; - - if ((sched_whichqs & (1 << which)) == 0) - panic("remrunqueue"); - p->p_forw->p_back = p->p_back; - p->p_back->p_forw = p->p_forw; - p->p_back = NULL; - q = &sched_qs[which]; - if (q->ph_link == (struct proc *)q) - sched_whichqs &= ~(1 << which); -}