[src/trunk]: src/sys/arch/sparc64 Follow the sparc port and use the MI versio...

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

details:   https://anonhg.NetBSD.org/src/rev/e4cd69243381
branches:  trunk
changeset: 540275:e4cd69243381
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Dec 08 22:30:53 2002 +0000

description:
Follow the sparc port and use the MI versions of setrunqueue and
remrunqueue.

diffstat:

 sys/arch/sparc64/conf/files.sparc64 |    3 +-
 sys/arch/sparc64/sparc64/locore2.c  |  101 ------------------------------------
 2 files changed, 1 insertions(+), 103 deletions(-)

diffs (122 lines):

diff -r b97ec8b9d798 -r e4cd69243381 sys/arch/sparc64/conf/files.sparc64
--- a/sys/arch/sparc64/conf/files.sparc64       Sun Dec 08 22:16:30 2002 +0000
+++ b/sys/arch/sparc64/conf/files.sparc64       Sun Dec 08 22:30:53 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.sparc64,v 1.71 2002/10/27 14:42:58 martin Exp $
+#      $NetBSD: files.sparc64,v 1.72 2002/12/08 22:30:53 martin Exp $
 
 # @(#)files.sparc64    8.1 (Berkeley) 7/19/93
 # sparc64-specific configuration info
@@ -182,7 +182,6 @@
 file   arch/sparc64/sparc64/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/sparc64/sparc64/locore2.c
 file   arch/sparc64/sparc64/machdep.c
 file   arch/sparc64/sparc64/process_machdep.c
 file   arch/sparc64/sparc64/procfs_machdep.c   procfs
diff -r b97ec8b9d798 -r e4cd69243381 sys/arch/sparc64/sparc64/locore2.c
--- a/sys/arch/sparc64/sparc64/locore2.c        Sun Dec 08 22:16:30 2002 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,101 +0,0 @@
-/*     $NetBSD: locore2.c,v 1.2 2000/05/26 21:20:21 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 <sys/param.h>
-#include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/sched.h>
-#include <sys/resourcevar.h>
-
-#include <machine/cpu.h>
-
-/*
- * 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("remrq");
-       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);
-}