Module Name: src
Committed By: riastradh
Date: Mon Mar 2 17:34:23 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/drm: drm_vma_manager.c
Log Message:
Don't sleep in the drm_vma allocator. Fail with ENOSPC, not ENOMEM.
Caller has dev->struct_mutex locked and will handle ENOSPC anyway.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/drm2/drm/drm_vma_manager.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/drm/drm_vma_manager.c
diff -u src/sys/external/bsd/drm2/drm/drm_vma_manager.c:1.1 src/sys/external/bsd/drm2/drm/drm_vma_manager.c:1.2
--- src/sys/external/bsd/drm2/drm/drm_vma_manager.c:1.1 Wed Jul 16 20:56:25 2014
+++ src/sys/external/bsd/drm2/drm/drm_vma_manager.c Mon Mar 2 17:34:23 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_vma_manager.c,v 1.1 2014/07/16 20:56:25 riastradh Exp $ */
+/* $NetBSD: drm_vma_manager.c,v 1.2 2015/03/02 17:34:23 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_vma_manager.c,v 1.1 2014/07/16 20:56:25 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_vma_manager.c,v 1.2 2015/03/02 17:34:23 riastradh Exp $");
#include <sys/kmem.h>
#include <sys/rbtree.h>
@@ -164,11 +164,14 @@ drm_vma_offset_add(struct drm_vma_offset
if (0 < node->von_npages)
return 0;
- error = vmem_alloc(mgr->vom_vmem, npages, VM_SLEEP|VM_BESTFIT,
+ error = vmem_alloc(mgr->vom_vmem, npages, VM_NOSLEEP|VM_BESTFIT,
&startpage);
- if (error)
+ if (error) {
+ if (error == ENOMEM)
+ error = ENOSPC;
/* XXX errno NetBSD->Linux */
return -error;
+ }
node->von_startpage = startpage;
node->von_npages = npages;
