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

pc: move low-level allocation details out of mmu.c into memory.c rampage() function

Browse source
This commit is contained in:
cinap_lenrek 2019-10-02 01:01:34 +02:00
parent 0ee738ef8c
commit c0f464b98f
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sys/src/9/pc/memory.c
View file

@ -224,6 +224,8 @@ rampage(void)
{ {
ulong m; ulong m;
if(conf.mem[0].npage != 0)
return xspanalloc(BY2PG, BY2PG, 0);
m = mapalloc(&rmapram, 0, BY2PG, BY2PG); m = mapalloc(&rmapram, 0, BY2PG, BY2PG);
if(m == 0) if(m == 0)
return nil; return nil;

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

@ -523,17 +523,9 @@ mmuwalk(ulong* pdb, ulong va, int level, int create)
if(*table & PTESIZE) if(*table & PTESIZE)
panic("mmuwalk2: va %luX entry %luX", va, *table); panic("mmuwalk2: va %luX entry %luX", va, *table);
if(!(*table & PTEVALID)){ if(!(*table & PTEVALID)){
/* map = rampage();
* Have to call low-level allocator from
* memory.c if we haven't set up the xalloc
* tables yet.
*/
if(conf.mem[0].npage != 0)
map = xspanalloc(BY2PG, BY2PG, 0);
else
map = rampage();
if(map == nil) if(map == nil)
panic("mmuwalk xspanalloc failed"); panic("mmuwalk: page alloc failed");
*table = PADDR(map)|PTEWRITE|PTEVALID; *table = PADDR(map)|PTEWRITE|PTEVALID;
} }
table = KADDR(PPN(*table)); table = KADDR(PPN(*table));