From 172f829240059b0b1088518ecda8774f4128a703 Mon Sep 17 00:00:00 2001 From: martin Date: Mon, 22 Apr 2019 09:03:55 +0000 Subject: [PATCH] Pull up following revision(s) (requested by mrg in ticket #1239): sys/external/bsd/drm2/ttm/ttm_bo_vm.c: revision 1.12 ttm_bo_uvm_fault() is a netbsd API function and thus should return netbsd errnos. fix the one "return -ERESTART". --- sys/external/bsd/drm2/ttm/ttm_bo_vm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/external/bsd/drm2/ttm/ttm_bo_vm.c b/sys/external/bsd/drm2/ttm/ttm_bo_vm.c index 06c6fb646db3..af77609b9c3a 100644 --- a/sys/external/bsd/drm2/ttm/ttm_bo_vm.c +++ b/sys/external/bsd/drm2/ttm/ttm_bo_vm.c @@ -1,4 +1,4 @@ -/* $NetBSD: ttm_bo_vm.c,v 1.10 2015/07/28 01:25:00 riastradh Exp $ */ +/* $NetBSD: ttm_bo_vm.c,v 1.10.10.1 2019/04/22 09:03:55 martin Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ttm_bo_vm.c,v 1.10 2015/07/28 01:25:00 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ttm_bo_vm.c,v 1.10.10.1 2019/04/22 09:03:55 martin Exp $"); #include @@ -112,7 +112,7 @@ ttm_bo_uvm_fault(struct uvm_faultinfo *ufi, vaddr_t vaddr, */ uvmfault_unlockall(ufi, ufi->entry->aref.ar_amap, NULL); (void)ttm_bo_wait_unreserved(bo); - return -ERESTART; + return ERESTART; } /* drm prime buffers are not mappable. XXX Catch this earlier? */