diff options
| author | kib <kib@FreeBSD.org> | 2016-10-20 11:42:29 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2016-10-20 11:42:29 +0000 |
| commit | b1afd105d1a37b6b844b2131ab029eb19e33ae71 (patch) | |
| tree | 2621dbfd8219e8bfe84323a7208d3cb5eec7e57e /sys/dev/drm2 | |
| parent | 64cff8c2f546be383dddc807196705ea791c29c5 (diff) | |
| download | FreeBSD-src-b1afd105d1a37b6b844b2131ab029eb19e33ae71.zip FreeBSD-src-b1afd105d1a37b6b844b2131ab029eb19e33ae71.tar.gz | |
MFC r307218:
Fix a race in vm_page_busy_sleep(9).
Diffstat (limited to 'sys/dev/drm2')
| -rw-r--r-- | sys/dev/drm2/i915/i915_gem.c | 4 | ||||
| -rw-r--r-- | sys/dev/drm2/ttm/ttm_bo_vm.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/drm2/i915/i915_gem.c b/sys/dev/drm2/i915/i915_gem.c index 2e75623..6e9a86c 100644 --- a/sys/dev/drm2/i915/i915_gem.c +++ b/sys/dev/drm2/i915/i915_gem.c @@ -1533,7 +1533,7 @@ retry: DRM_UNLOCK(dev); vm_page_lock(page); VM_OBJECT_WUNLOCK(vm_obj); - vm_page_busy_sleep(page, "915pee"); + vm_page_busy_sleep(page, "915pee", false); goto retry; } goto have_page; @@ -1575,7 +1575,7 @@ retry: DRM_UNLOCK(dev); vm_page_lock(page); VM_OBJECT_WUNLOCK(vm_obj); - vm_page_busy_sleep(page, "915pbs"); + vm_page_busy_sleep(page, "915pbs", false); goto retry; } if (vm_page_insert(page, vm_obj, OFF_TO_IDX(offset))) { diff --git a/sys/dev/drm2/ttm/ttm_bo_vm.c b/sys/dev/drm2/ttm/ttm_bo_vm.c index 438077b..60bf8e2 100644 --- a/sys/dev/drm2/ttm/ttm_bo_vm.c +++ b/sys/dev/drm2/ttm/ttm_bo_vm.c @@ -236,7 +236,7 @@ reserve: if (vm_page_busied(m)) { vm_page_lock(m); VM_OBJECT_WUNLOCK(vm_obj); - vm_page_busy_sleep(m, "ttmpbs"); + vm_page_busy_sleep(m, "ttmpbs", false); VM_OBJECT_WLOCK(vm_obj); ttm_mem_io_unlock(man); ttm_bo_unreserve(bo); |
