oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unmap VR_DIRECT mappings too (fix for X)

Browse Source
This commit is contained in:
Ben Gras 2009-09-22 11:51:17 +00:00
parent 76a02db5e7
commit 0b713b0de5
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
servers/vm/region.c
View File

@ -499,7 +499,9 @@ PRIVATE int map_subfree(struct vmproc *vmp,
return r; return r;
} }
vm_assert(pr->ph->refcount == 1); vm_assert(pr->ph->refcount == 1);
FREE_MEM(ABS2CLICK(pr->ph->phys), ABS2CLICK(sublen)); if(!(region->flags & VR_DIRECT)) {
FREE_MEM(ABS2CLICK(pr->ph->phys), ABS2CLICK(sublen));
}
USE(pr, pr->offset += sublen;); USE(pr, pr->offset += sublen;);
USE(pr->ph, USE(pr->ph,
pr->ph->phys += sublen; pr->ph->phys += sublen;
@ -1214,8 +1216,8 @@ PUBLIC int map_unmap_region(struct vmproc *vmp, struct vir_region *region,
return EINVAL; return EINVAL;
} }
if(!(r->flags & VR_ANON)) { if(!(r->flags & (VR_ANON|VR_DIRECT))) {
printf("VM: only unmap anonymous memory\n"); printf("VM: only unmap anonymous or direct memory\n");
return EINVAL; return EINVAL;
} }