From 7746749c8e31e60774072283e1f2131a40a34a10 Mon Sep 17 00:00:00 2001 From: David du Colombier <0intro@gmail.com> Date: Tue, 11 Jun 1991 00:00:00 +0000 Subject: [PATCH] Plan 9 from Bell Labs 1991-06-11 --- port/fault.c | 5 +---- power/main.c | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/port/fault.c b/port/fault.c index fd6e061c56ad60eadb35e3091e932ae04bd66b2e..826daf112a00cadd8718a137b00ffcf2115bfe54 100644 --- a/port/fault.c +++ b/port/fault.c @@ -226,10 +226,6 @@ fault(ulong addr, int read) m->tlbfault++; putmmu(mmuvirt, mmuphys); -/* - if(s - u->p->seg == LSEG) - print("%d: f %lux v %lux p %lux\n", u->p->pid, o->flag, mmuvirt, mmuphys); -*/ return 0; } @@ -299,5 +295,6 @@ seg(Proc *p, ulong addr) for(s=p->seg; s < et; s++) if(s->o && s->minva<=addr && addrmaxva) return s; + return 0; } diff --git a/power/main.c b/power/main.c index 4fb3932d94526bbc546096d3efa92bb22b503c49..879ea32b8080f0d954ff8d29cfb499d32d7fdaca 100644 --- a/power/main.c +++ b/power/main.c @@ -271,7 +271,7 @@ userinit(void) */ s = &p->seg[SSEG]; s->proc = p; - s->o = neworig(USTKTOP-BY2PG, 1, OWRPERM, 0); + s->o = neworig(USTKTOP-BY2PG, 1, OWRPERM|OISMEM, 0); s->o->pte[0].page = newpage(0, 0, USTKTOP-BY2PG); memmove((ulong*)(s->o->pte[0].page->pa|KZERO|(BY2PG-argsize)), argbuf + sizeof(argbuf) - argsize, argsize); @@ -290,7 +290,7 @@ userinit(void) * On the mips, init text must be OCACHED to avoid reusing page * and getting in trouble with the hardware instruction cache. */ - s->o = neworig(UTZERO, 1, OCACHED, 0); + s->o = neworig(UTZERO, 1, OCACHED|OISMEM, 0); s->o->pte[0].page = newpage(0, 0, UTZERO); s->o->npage = 1; k = kmap(s->o->pte[0].page);