[src/nathanw_sa]: src/sys/arch Sync with HEAD.

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

details:   https://anonhg.NetBSD.org/src/rev/bd21acd37211
branches:  nathanw_sa
changeset: 506706:bd21acd37211
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Wed Jan 08 01:00:14 2003 +0000

description:
Sync with HEAD.

diffstat:

 sys/arch/acorn26/acorn26/Locore.c |  50 +-------------------------------
 sys/arch/acorn26/include/types.h  |   3 +-
 sys/arch/alpha/alpha/machdep.c    |  60 +-------------------------------------
 sys/arch/alpha/include/types.h    |   3 +-
 4 files changed, 6 insertions(+), 110 deletions(-)

diffs (184 lines):

diff -r 36a00fc7e558 -r bd21acd37211 sys/arch/acorn26/acorn26/Locore.c
--- a/sys/arch/acorn26/acorn26/Locore.c Tue Jan 07 23:51:53 2003 +0000
+++ b/sys/arch/acorn26/acorn26/Locore.c Wed Jan 08 01:00:14 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: Locore.c,v 1.3.2.5 2002/12/31 01:03:46 thorpej Exp $   */
+/*     $NetBSD: Locore.c,v 1.3.2.6 2003/01/08 01:00:14 thorpej Exp $   */
 
 /*
  * Copyright (c) 2000 Ben Harris.
@@ -41,7 +41,7 @@
 
 #include <sys/param.h>
 
-__RCSID("$NetBSD: Locore.c,v 1.3.2.5 2002/12/31 01:03:46 thorpej Exp $");
+__RCSID("$NetBSD: Locore.c,v 1.3.2.6 2003/01/08 01:00:14 thorpej Exp $");
 
 #include <sys/proc.h>
 #include <sys/sched.h>
@@ -59,52 +59,6 @@
 struct pcb *curpcb;
 
 /*
- * 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(struct lwp *l)
-{
-       struct  prochd *q;
-       struct lwp *oldlast;
-       int which = l->l_priority >> 2;
-       
-#ifdef DIAGNOSTIC
-       if (l->l_back)
-               panic("setrunqueue");
-#endif
-       q = &sched_qs[which];
-       sched_whichqs |= 1 << which;
-       l->l_forw = (struct lwp *)q;
-       l->l_back = oldlast = q->ph_rlink;
-       q->ph_rlink = l;
-       oldlast->l_forw = l;
-}
-
-/*
- * Remove process p from its run queue, which should be the one
- * indicated by its priority.
- * Calls should be made at splstatclock().
- */
-void
-remrunqueue(struct lwp *l)
-{
-       int which = l->l_priority >> 2;
-       struct prochd *q;
-
-#ifdef DIAGNOSTIC      
-       if (!(sched_whichqs & (1 << which)))
-               panic("remrunqueue");
-#endif
-       l->l_forw->l_back = l->l_back;
-       l->l_back->l_forw = l->l_forw;
-       l->l_back = NULL;
-       q = &sched_qs[which];
-       if (q->ph_link == (struct lwp *)q)
-               sched_whichqs &= ~(1 << which);
-}
-
-/*
  * Idle
  */
 void
diff -r 36a00fc7e558 -r bd21acd37211 sys/arch/acorn26/include/types.h
--- a/sys/arch/acorn26/include/types.h  Tue Jan 07 23:51:53 2003 +0000
+++ b/sys/arch/acorn26/include/types.h  Wed Jan 08 01:00:14 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.1.8.2 2002/10/18 02:33:26 nathanw Exp $ */
+/* $NetBSD: types.h,v 1.1.8.3 2003/01/08 01:00:16 thorpej Exp $ */
 
 #ifndef        _ACORN26_TYPES_H_
 #define        _ACORN26_TYPES_H_
@@ -6,6 +6,5 @@
 #include <arm/arm26/types.h>
 
 #define        __HAVE_GENERIC_SOFT_INTERRUPTS
-#define        __HAVE_MD_RUNQUEUE
 
 #endif /* _ACORN26_TYPES_H_ */
diff -r 36a00fc7e558 -r bd21acd37211 sys/arch/alpha/alpha/machdep.c
--- a/sys/arch/alpha/alpha/machdep.c    Tue Jan 07 23:51:53 2003 +0000
+++ b/sys/arch/alpha/alpha/machdep.c    Wed Jan 08 01:00:14 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.248.2.23 2002/12/16 17:26:26 nathanw Exp $ */
+/* $NetBSD: machdep.c,v 1.248.2.24 2003/01/08 01:03:23 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -75,7 +75,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.248.2.23 2002/12/16 17:26:26 nathanw Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.248.2.24 2003/01/08 01:03:23 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1946,62 +1946,6 @@
 }
 
 /*
- * The following primitives manipulate the run queues.  _whichqs tells which
- * of the 32 queues _qs have processes in them.  Setrunqueue puts processes
- * into queues, Remrunqueue removes them from queues.  The running process is
- * on no queue, other processes are on a queue related to l->l_priority,
- * divided by 4 actually to shrink the 0-127 range of priorities into the 32
- * available queues.
- */
-/*
- * setrunqueue(l)
- *     lwp *l;
- *
- * Call should be made at splclock(), and l->l_stat should be LSRUN.
- */
-
-void
-setrunqueue(l)
-       struct lwp *l;
-{
-       int bit;
-
-       /* firewall: p->p_back must be NULL */
-       if (l->l_back != NULL)
-               panic("setrunqueue");
-
-       bit = l->l_priority >> 2;
-       sched_whichqs |= (1 << bit);
-       l->l_forw = (struct lwp *)&sched_qs[bit];
-       l->l_back = sched_qs[bit].ph_rlink;
-       l->l_back->l_forw = l;
-       sched_qs[bit].ph_rlink = l;
-}
-
-/*
- * remrunqueue(l)
- *
- * Call should be made at splclock().
- */
-void
-remrunqueue(l)
-       struct lwp *l;
-{
-       int bit;
-
-       bit = l->l_priority >> 2;
-       if ((sched_whichqs & (1 << bit)) == 0)
-               panic("remrunqueue");
-
-       l->l_back->l_forw = l->l_forw;
-       l->l_forw->l_back = l->l_back;
-       l->l_back = NULL;       /* for firewall checking. */
-
-       if ((struct lwp *)&sched_qs[bit] == sched_qs[bit].ph_link)
-               sched_whichqs &= ~(1 << bit);
-}
-
-/*
  * Wait "n" microseconds.
  */
 void
diff -r 36a00fc7e558 -r bd21acd37211 sys/arch/alpha/include/types.h
--- a/sys/arch/alpha/include/types.h    Tue Jan 07 23:51:53 2003 +0000
+++ b/sys/arch/alpha/include/types.h    Wed Jan 08 01:00:14 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.21.4.4 2002/10/18 02:34:13 nathanw Exp $ */
+/* $NetBSD: types.h,v 1.21.4.5 2003/01/08 01:03:27 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1990, 1993
@@ -66,6 +66,5 @@
 #define        __HAVE_MINIMAL_EMUL
 #define        __HAVE_AST_PERPROC
 #define        __HAVE_RAS
-#define        __HAVE_MD_RUNQUEUE
 
 #endif /* _MACHTYPES_H_ */