From 4ec0e298ecf760a1add20d4b2cfd44d2813ff888 Mon Sep 17 00:00:00 2001 From: David du Colombier <0intro@gmail.com> Date: Fri, 1 Feb 2002 00:00:00 +0000 Subject: [PATCH] Plan 9 from Bell Labs 2002-02-01 --- mtx/mmu.c | 6 ------ port/devproc.c | 4 ++-- port/devtls.c | 6 ++---- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/mtx/mmu.c b/mtx/mmu.c index 218b7966d272b440d64df20afde7070ec52aa5bc..7e20aeb922f399b0e842d338f115cc67cd5311ad 100644 --- a/mtx/mmu.c +++ b/mtx/mmu.c @@ -34,7 +34,6 @@ mmuinit(void) { int lhash, mem; extern ulong memsize; /* passed in from ROM monitor */ - ulong v; if(ptabsize == 0) { /* heuristically size the hash table */ @@ -51,11 +50,6 @@ mmuinit(void) m->ptabbase = (ulong)xspanalloc(ptabsize, 0, ptabsize); putsdr1(PADDR(m->ptabbase) | (ptabmask>>10)); m->mmupid = PIDBASE; - - v = getdec(); - memset((void*)m->ptabbase, 0, ptabsize); - v -= getdec(); - print("memset took %lud cycles, dechz %lud\n", v, m->dechz); } void diff --git a/port/devproc.c b/port/devproc.c index b95339a7047b731f093a46c966026d3f0dbb3dc0..ea58901ca7a0bc25fda7d987006d91f48b01cf8d 100644 --- a/port/devproc.c +++ b/port/devproc.c @@ -277,12 +277,12 @@ procopen(Chan *c, int omode) break; case Qmem: + case Qnote: + case Qctl: if(p->privatemem) error(Eperm); /* fall through */ case Qargs: - case Qctl: - case Qnote: case Qnoteid: case Qstatus: case Qwait: diff --git a/port/devtls.c b/port/devtls.c index f111a64bad90bc3a9c398c2727b53f48d557cf85..51f99e4139ed79106dc5d9f8d874e3d69dbb7543 100644 --- a/port/devtls.c +++ b/port/devtls.c @@ -1626,10 +1626,8 @@ tlsinit(void) int n; char *cp; - if((tlsdevs = smalloc(sizeof(TlsRec*) * maxtlsdevs)) == 0) - panic("tlsinit"); - if((trnames = smalloc((sizeof *trnames) * maxtlsdevs)) == 0) - panic("tlsinit"); + tlsdevs = smalloc(sizeof(TlsRec*) * maxtlsdevs); + trnames = smalloc((sizeof *trnames) * maxtlsdevs); n = 1; for(e = encrypttab; e->name != nil; e++)