xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

merge

Browse source
This commit is contained in:
cinap_lenrek 2020-04-06 01:31:35 +02:00
parent 80fdafd1d6 9e2344a5be
commit 665b78da23
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sys/src/9/pc/mmu.c
View file

@ -524,8 +524,7 @@ mmuwalk(ulong* pdb, ulong va, int level, int create)
panic("mmuwalk2: va %luX entry %luX", va, *table); panic("mmuwalk2: va %luX entry %luX", va, *table);
if(!(*table & PTEVALID)){ if(!(*table & PTEVALID)){
map = rampage(); map = rampage();
if(map == nil) memset(map, 0, BY2PG);
panic("mmuwalk: page alloc failed");
*table = PADDR(map)|PTEWRITE|PTEVALID; *table = PADDR(map)|PTEWRITE|PTEVALID;
} }
table = KADDR(PPN(*table)); table = KADDR(PPN(*table));

2
sys/src/9/pc64/mmu.c
View file

@ -299,8 +299,6 @@ ptesplit(uintptr* table, uintptr va)
if(pte == nil || (*pte & PTESIZE) == 0 || (va & PGLSZ(1)-1) == 0) if(pte == nil || (*pte & PTESIZE) == 0 || (va & PGLSZ(1)-1) == 0)
return; return;
table = rampage(); table = rampage();
if(table == nil)
panic("ptesplit: out of memory\n");
va &= -PGLSZ(1); va &= -PGLSZ(1);
pa = *pte & ~PTESIZE; pa = *pte & ~PTESIZE;
for(off = 0; off < PGLSZ(1); off += PGLSZ(0)) for(off = 0; off < PGLSZ(1); off += PGLSZ(0))