diff options
| author | cinap_lenrek <cinap_lenrek@felloff.net> | 2020-04-06 01:31:35 +0200 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@felloff.net> | 2020-04-06 01:31:35 +0200 |
| commit | 665b78da231f568f530c329bc9305f9bf050a2de (patch) | |
| tree | eb7dee809f1cb7a4384b9b4624d47803a285e0c1 | |
| parent | 80fdafd1d6bc27d7a94fabc12f4af37285a17338 (diff) | |
| parent | 9e2344a5be97b416c73c81f01913702fd6d2da6c (diff) | |
| download | plan9front-665b78da231f568f530c329bc9305f9bf050a2de.tar.xz | |
merge
| -rw-r--r-- | sys/src/9/pc/mmu.c | 3 | ||||
| -rw-r--r-- | sys/src/9/pc64/mmu.c | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/sys/src/9/pc/mmu.c b/sys/src/9/pc/mmu.c index edcf866db..c0b13674a 100644 --- a/sys/src/9/pc/mmu.c +++ b/sys/src/9/pc/mmu.c @@ -524,8 +524,7 @@ mmuwalk(ulong* pdb, ulong va, int level, int create) panic("mmuwalk2: va %luX entry %luX", va, *table); if(!(*table & PTEVALID)){ map = rampage(); - if(map == nil) - panic("mmuwalk: page alloc failed"); + memset(map, 0, BY2PG); *table = PADDR(map)|PTEWRITE|PTEVALID; } table = KADDR(PPN(*table)); diff --git a/sys/src/9/pc64/mmu.c b/sys/src/9/pc64/mmu.c index 78725b3e4..f7c8bb7e5 100644 --- a/sys/src/9/pc64/mmu.c +++ b/sys/src/9/pc64/mmu.c @@ -299,8 +299,6 @@ ptesplit(uintptr* table, uintptr va) if(pte == nil || (*pte & PTESIZE) == 0 || (va & PGLSZ(1)-1) == 0) return; table = rampage(); - if(table == nil) - panic("ptesplit: out of memory\n"); va &= -PGLSZ(1); pa = *pte & ~PTESIZE; for(off = 0; off < PGLSZ(1); off += PGLSZ(0)) |