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

merge

Browse source
This commit is contained in:
cinap_lenrek 2015-11-06 17:28:29 +01:00
commit b21482828b
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sys/src/9/port/fault.c
View file

@ -237,10 +237,8 @@ fixfault(Segment *s, uintptr addr, int read)
return -1;
*pg = new;
}
goto common;
case SG_DATA:
common: /* Demand load/pagein/copy on write */
/* wet floor */
case SG_DATA: /* Demand load/pagein/copy on write */
if(pagedout(*pg))
pio(s, addr, soff, pg);
@ -279,6 +277,7 @@ fixfault(Segment *s, uintptr addr, int read)
new->ref = 1;
*pg = new;
}
/* wet floor */
case SG_FIXED: /* Never paged out */
if (checkaddr && addr == addr2check)
(*checkaddr)(addr, s, *pg);
@ -301,7 +300,7 @@ okaddr(uintptr addr, ulong len, int write)
{
Segment *s;
if((long)len >= 0 && addr+len >= addr) {
if((long)len >= 0 && len <= -addr) {
for(;;) {
s = seg(up, addr, 0);
if(s == nil || (write && (s->type&SG_RONLY)))