diff options
| author | markj <markj@FreeBSD.org> | 2017-05-23 07:27:30 +0000 |
|---|---|---|
| committer | markj <markj@FreeBSD.org> | 2017-05-23 07:27:30 +0000 |
| commit | b1d352b152cd31bddbbb83670b7f45a213ca52cb (patch) | |
| tree | d6aa7d62302443402a45530a50b241fd0f5128b9 /sys/kern | |
| parent | a6749049ae872846ba11cc9c7c14e8f8d61425f1 (diff) | |
| download | FreeBSD-src-b1d352b152cd31bddbbb83670b7f45a213ca52cb.zip FreeBSD-src-b1d352b152cd31bddbbb83670b7f45a213ca52cb.tar.gz | |
MFC r308474, r308691, r309203, r309365, r309703, r309898, r310720,
r308489, r308706:
Add PQ_LAUNDRY and remove PG_CACHED pages.
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/kern_exec.c | 2 | ||||
| -rw-r--r-- | sys/kern/uipc_shm.c | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index 7d9adb0..1a41aac 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -1006,7 +1006,7 @@ exec_map_first_page(imgp) break; } else { ma[i] = vm_page_alloc(object, i, - VM_ALLOC_NORMAL | VM_ALLOC_IFNOTCACHED); + VM_ALLOC_NORMAL); if (ma[i] == NULL) break; } diff --git a/sys/kern/uipc_shm.c b/sys/kern/uipc_shm.c index 0a45380..0aee62f 100644 --- a/sys/kern/uipc_shm.c +++ b/sys/kern/uipc_shm.c @@ -455,12 +455,9 @@ retry: VM_WAIT; VM_OBJECT_WLOCK(object); goto retry; - } else if (m->valid != VM_PAGE_BITS_ALL) - rv = vm_pager_get_pages(object, &m, 1, - NULL, NULL); - else - /* A cached page was reactivated. */ - rv = VM_PAGER_OK; + } + rv = vm_pager_get_pages(object, &m, 1, NULL, + NULL); vm_page_lock(m); if (rv == VM_PAGER_OK) { vm_page_deactivate(m); |
