[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915/gem i915_gem_shmem.c: sh...

[tnn <tnn%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5d79d1858ff6
branches:  trunk
changeset: 1029091:5d79d1858ff6
user:      tnn <tnn%NetBSD.org@localhost>
date:      Tue Dec 21 12:00:40 2021 +0000

description:
i915_gem_shmem.c: shmem_get_pages: fix uninitialize use of "noreclaim"

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_shmem.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (33 lines):

diff -r 47e93c5bafd4 -r 5d79d1858ff6 sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_shmem.c
--- a/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_shmem.c  Tue Dec 21 11:44:18 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_shmem.c  Tue Dec 21 12:00:40 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_gem_shmem.c,v 1.10 2021/12/19 12:25:56 riastradh Exp $    */
+/*     $NetBSD: i915_gem_shmem.c,v 1.11 2021/12/21 12:00:40 tnn Exp $  */
 
 /*
  * SPDX-License-Identifier: MIT
@@ -7,7 +7,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_gem_shmem.c,v 1.10 2021/12/19 12:25:56 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem_shmem.c,v 1.11 2021/12/21 12:00:40 tnn Exp $");
 
 #include <linux/pagevec.h>
 #include <linux/swap.h>
@@ -89,12 +89,13 @@
         */
 #ifdef __NetBSD__
        mapping = obj->base.filp;
+       noreclaim = GFP_KERNEL;
 #else
        mapping = obj->base.filp->f_mapping;
        mapping_set_unevictable(mapping);
        noreclaim = mapping_gfp_constraint(mapping, ~__GFP_RECLAIM);
+#endif
        noreclaim |= __GFP_NORETRY | __GFP_NOWARN;
-#endif
 
        sg = st->sgl;
        st->nents = 0;