From d5b75b19639320c023b2b9c2fef88b9e167a205f Mon Sep 17 00:00:00 2001 From: David du Colombier <0intro@gmail.com> Date: Tue, 16 Aug 1994 00:00:00 +0000 Subject: [PATCH] Plan 9 from Bell Labs 1994-08-16 --- pc/trap.c | 5 +---- port/devproc.c | 1 - port/portdat.h | 5 +---- port/portfns.h | 3 ++- port/proc.c | 5 ----- 5 files changed, 4 insertions(+), 15 deletions(-) diff --git a/pc/trap.c b/pc/trap.c index 4c1d05ecc89365eae53bd78d6e9caeec4e1f2cef..5a1cc7a0bb51acf880c50848fee75bd932e52b7a 100644 --- a/pc/trap.c +++ b/pc/trap.c @@ -376,15 +376,13 @@ dumpstack(void) { ulong l, v, i; extern ulong etext; - int lim; Crashstate *cs; if(up == 0) return; i = 0; - lim = 6; - for(l=(ulong)&l; l<(ulong)(up->kstack+KSTACK) && lim; l+=4){ + for(l=(ulong)&l; l<(ulong)(up->kstack+KSTACK); l+=4){ v = *(ulong*)l; if(KTZERO < v && v < (ulong)&etext){ print("%lux ", v); @@ -393,7 +391,6 @@ dumpstack(void) if(i == 8){ i = 0; print("\n"); - lim--; } } diff --git a/port/devproc.c b/port/devproc.c index d17d8a94b7f2a40f2df3136d11dbc5f0b5e1d9ff..42fa5b5159ca55399b41bace2639547a7cc98383 100644 --- a/port/devproc.c +++ b/port/devproc.c @@ -697,7 +697,6 @@ void procctlreq(Proc *p, char *va, int n) { char buf[NAMELEN]; - extern int pfthreshold; if(n > NAMELEN) n = NAMELEN; diff --git a/port/portdat.h b/port/portdat.h index 99697c75369f806534ee98b4667c8b26572dcc85..a5569f7485d4c2d1c671852339dbddcb431170c0 100644 --- a/port/portdat.h +++ b/port/portdat.h @@ -500,10 +500,7 @@ enum NERR = 15, NNOTE = 5, - Pcounter = 6, /* per process counters */ - CSCNTR = 0, /* sched counter */ - FAULTCNTR = 1, /* fault counter */ - TLBCNTR = 2, /* utlbmiss */ + Nrq = 5, }; struct Proc diff --git a/port/portfns.h b/port/portfns.h index 72eb61a079a3cc2d4267a1c77bde94fff4677a69..707ac655ffb6fe4b1eeb978c03504b81058b59a2 100644 --- a/port/portfns.h +++ b/port/portfns.h @@ -126,6 +126,7 @@ void machinit(void); void* mallocz(ulong, int); void* malloc(ulong); void mfreeseg(Segment*, ulong, int); +void microdelay(int); void mmurelease(Proc*); void mmuswitch(Proc*); void mntdump(void); @@ -267,7 +268,7 @@ void* xspanalloc(ulong, int, ulong); void xsummary(void); int z8530m3mouse(Queue*, int); int z8530mouse(Queue*, int); -void z8530setup(uchar*, uchar*, uchar*, uchar*, ulong, int, int); +void z8530setup(uchar*, uchar*, uchar*, uchar*, ulong, int); void z8530special(int, int, Queue**, Queue**, int (*)(Queue*, int)); void z8530intr(int); Segment* data2txt(Segment*); diff --git a/port/proc.c b/port/proc.c index 3c941859fb09565c1a987487f54d4f5343e47e2d..e20447d5a0df5eb867c94519ea7310f839268de7 100644 --- a/port/proc.c +++ b/port/proc.c @@ -22,11 +22,6 @@ struct }waitqalloc; -enum -{ - Nrq = 5, /* number of run queues */ -}; - int nrdy; Schedq runq[Nrq];