diff options
| author | Renato Botelho <renato@netgate.com> | 2016-11-02 10:47:11 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-11-02 10:47:11 -0200 |
| commit | 3c84ef4df7f599fdf9db66521c3d33c167458687 (patch) | |
| tree | 95795d4a6304e89128b277db8769df4a7d074fa4 /sys/vm/vm_object.c | |
| parent | eb2387fb3f25275b8ca223e3c464563294982bde (diff) | |
| parent | 3944e88fda9dc9f4f391a06b18cd7583f783e8ec (diff) | |
| download | FreeBSD-src-3c84ef4df7f599fdf9db66521c3d33c167458687.zip FreeBSD-src-3c84ef4df7f599fdf9db66521c3d33c167458687.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'sys/vm/vm_object.c')
| -rw-r--r-- | sys/vm/vm_object.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index b2a7013..d4c7116 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -1182,7 +1182,7 @@ shadowlookup: if (object != tobject) VM_OBJECT_WUNLOCK(object); VM_OBJECT_WUNLOCK(tobject); - vm_page_busy_sleep(m, "madvpo"); + vm_page_busy_sleep(m, "madvpo", false); VM_OBJECT_WLOCK(object); goto relookup; } @@ -1361,7 +1361,7 @@ retry: VM_OBJECT_WUNLOCK(new_object); vm_page_lock(m); VM_OBJECT_WUNLOCK(orig_object); - vm_page_busy_sleep(m, "spltwt"); + vm_page_busy_sleep(m, "spltwt", false); VM_OBJECT_WLOCK(orig_object); VM_OBJECT_WLOCK(new_object); goto retry; @@ -1450,7 +1450,7 @@ vm_object_backing_scan_wait(vm_object_t object, vm_page_t p, vm_page_t next, if (p == NULL) VM_WAIT; else - vm_page_busy_sleep(p, "vmocol"); + vm_page_busy_sleep(p, "vmocol", false); VM_OBJECT_WLOCK(object); VM_OBJECT_WLOCK(backing_object); return (TAILQ_FIRST(&backing_object->memq)); @@ -1917,7 +1917,7 @@ again: vm_page_lock(p); if (vm_page_xbusied(p)) { VM_OBJECT_WUNLOCK(object); - vm_page_busy_sleep(p, "vmopax"); + vm_page_busy_sleep(p, "vmopax", true); VM_OBJECT_WLOCK(object); goto again; } @@ -1932,7 +1932,7 @@ again: } if (vm_page_busied(p)) { VM_OBJECT_WUNLOCK(object); - vm_page_busy_sleep(p, "vmopar"); + vm_page_busy_sleep(p, "vmopar", false); VM_OBJECT_WLOCK(object); goto again; } |
