diff options
| author | Mark Johnston <markj@FreeBSD.org> | 2020-03-01 22:09:11 +0000 |
|---|---|---|
| committer | Mark Johnston <markj@FreeBSD.org> | 2020-03-01 22:09:11 +0000 |
| commit | 1ed42f6fdd5a4d82be4f842feb643d9150f9ccc3 (patch) | |
| tree | a4ba51486e366ae1d6990630608cacf0d71903f6 | |
| parent | 2f423bce54f2bb026508df7404978cf9cee7abc2 (diff) | |
| download | src-1ed42f6fdd5a4d82be4f842feb643d9150f9ccc3.tar.gz src-1ed42f6fdd5a4d82be4f842feb643d9150f9ccc3.zip | |
Avoid doubly wiring a newly allocated page in vm_page_grab_valid().
This fixes a regression from r358363.
Reported by: manu, jbeich
Tested by: jbeich
Notes
Notes:
svn path=/head/; revision=358505
| -rw-r--r-- | sys/vm/vm_page.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 9d50881ed27e..41e7a5bb3099 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -4535,7 +4535,8 @@ vm_page_grab_valid(vm_page_t *mp, vm_object_t object, vm_pindex_t pindex, int al (VM_ALLOC_NOWAIT | VM_ALLOC_WAITFAIL | VM_ALLOC_ZERO)) == 0, ("vm_page_grab_valid: Invalid flags 0x%X", allocflags)); VM_OBJECT_ASSERT_WLOCKED(object); - pflags = allocflags & ~(VM_ALLOC_NOBUSY | VM_ALLOC_SBUSY); + pflags = allocflags & ~(VM_ALLOC_NOBUSY | VM_ALLOC_SBUSY | + VM_ALLOC_WIRED); pflags |= VM_ALLOC_WAITFAIL; retrylookup: |