From fedecc90268c9997f8a78af92a5f4676b87c4e09 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Wed, 14 Sep 1994 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1994-09-14

---
 port/devproc.c |  4 ++--
 port/portdat.h | 15 +++------------
 port/proc.c    |  7 +++++++
 port/swap.c    |  2 +-
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/port/devproc.c b/port/devproc.c
index 478d0fba8946af54a0a8b7387ccd210c53b0bafc..92202fbf7bd4fd6e1fab9138faf7980ec0a12028 100644
--- a/port/devproc.c
+++ b/port/devproc.c
@@ -737,10 +737,10 @@ procctlreq(Proc *p, char *va, int n)
 	else
 	if(strncmp(buf, "pri", 3) == 0){
 		if(n < 4)
-			error(Ebadarg);
+			error(Ebadctl);
 		i = atoi(buf+4);
 		if(i < 0 || i >= Nrq)
-			error(Ebadarg);
+			error(Ebadctl);
 		p->basepri = i;
 	}
 	else
diff --git a/port/portdat.h b/port/portdat.h
index 476bbf1343b4e52e20390098e93334e44db3f383..4ed1872be2b29dbf6565046a18861d653871ab03 100644
--- a/port/portdat.h
+++ b/port/portdat.h
@@ -32,7 +32,6 @@ typedef struct Rendez	Rendez;
 typedef struct Rgrp	Rgrp;
 typedef struct RWlock	RWlock;
 typedef struct Sargs	Sargs;
-typedef struct Schedq	Schedq;
 typedef struct Segment	Segment;
 typedef struct Session	Session;
 typedef struct Talarm	Talarm;
@@ -501,9 +500,9 @@ enum
 	NERR = 15,
 	NNOTE = 5,
 
-	Nrq		= 20,
-	PriNormal	= 10,
-	PriRoot		= 5,
+	Nrq		= 20,	/* number of scheduler priority levels */
+	PriNormal	= 10,	/* base priority for normal processes */
+	PriRoot		= 5,	/* base priority for root processes */
 };
 
 struct Proc
@@ -599,14 +598,6 @@ struct Proc
 	PMMU;
 };
 
-struct Schedq
-{
-	Lock;
-	Proc	*head;
-	Proc	*tail;
-	int	n;
-};
-
 enum
 {
 	PRINTSIZE =	256,
diff --git a/port/proc.c b/port/proc.c
index a1a9076404d495233ca3bd6fa066b28d9c1b4684..b5c208c9582999b0e5305b1b7df199588e97d474 100644
--- a/port/proc.c
+++ b/port/proc.c
@@ -21,6 +21,13 @@ struct
 	Waitq	*free;
 }waitqalloc;
 
+typedef struct
+{
+	Lock;
+	Proc	*head;
+	Proc	*tail;
+	int	n;
+} Schedq;
 
 int	nrdy;
 int	lastreadied;
diff --git a/port/swap.c b/port/swap.c
index f3e798ea40f6e178e769420e678c12e6109c66fd..30e51b66f06904d542316c7fe1557044bb9b509b 100644
--- a/port/swap.c
+++ b/port/swap.c
@@ -123,7 +123,7 @@ loop:
 		/* don't swap out programs from devroot.c - they
 		 * supply important system services
 		 */
-		img = p->seg[SG_TEXT]->image;
+		img = p->seg[TSEG]->image;
 		if(img && devchar[img->c->type] == '/')
 			continue;