Module Name: src
Committed By: riastradh
Date: Sun Dec 19 01:02:44 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_gem.c
Log Message:
Sync drm_gem_get_pages: drm_malloc_ab -> kvmalloc_array.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/external/bsd/drm2/dist/drm/drm_gem.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/dist/drm/drm_gem.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_gem.c:1.16 src/sys/external/bsd/drm2/dist/drm/drm_gem.c:1.17
--- src/sys/external/bsd/drm2/dist/drm/drm_gem.c:1.16 Sat Dec 18 23:44:57 2021
+++ src/sys/external/bsd/drm2/dist/drm/drm_gem.c Sun Dec 19 01:02:44 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_gem.c,v 1.16 2021/12/18 23:44:57 riastradh Exp $ */
+/* $NetBSD: drm_gem.c,v 1.17 2021/12/19 01:02:44 riastradh Exp $ */
/*
* Copyright © 2008 Intel Corporation
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_gem.c,v 1.16 2021/12/18 23:44:57 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_gem.c,v 1.17 2021/12/19 01:02:44 riastradh Exp $");
#include <linux/types.h>
#include <linux/slab.h>
@@ -600,12 +600,13 @@ drm_gem_get_pages(struct drm_gem_object
struct pglist pglist;
struct vm_page *vm_page;
struct page **pages;
- unsigned i;
+ unsigned i, npages;
int ret;
KASSERT((obj->size & (PAGE_SIZE - 1)) != 0);
- pages = drm_malloc_ab(obj->size >> PAGE_SHIFT, sizeof(*pages));
+ npages = obj->size >> PAGE_SHIFT;
+ pages = kvmalloc_array(npages, sizeof(*pages), GFP_KERNEL);
if (pages == NULL) {
ret = -ENOMEM;
goto fail0;
@@ -623,7 +624,7 @@ drm_gem_get_pages(struct drm_gem_object
return pages;
-fail1: drm_free_large(pages);
+fail1: kvfree(pages);
fail0: return ERR_PTR(ret);
}
#else
