Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:55:58 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_vma.c
src/sys/external/bsd/drm2/include/linux/sched: mm.h
Log Message:
linux: Shim fs_reclaim_acquire/release to reduce diff.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/dist/drm/i915/i915_vma.c
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/include/linux/sched/mm.h
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/i915/i915_vma.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_vma.c:1.6 src/sys/external/bsd/drm2/dist/drm/i915/i915_vma.c:1.7
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_vma.c:1.6 Sun Dec 19 11:37:41 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_vma.c Sun Dec 19 11:55:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_vma.c,v 1.6 2021/12/19 11:37:41 riastradh Exp $ */
+/* $NetBSD: i915_vma.c,v 1.7 2021/12/19 11:55:58 riastradh Exp $ */
/*
* Copyright © 2016 Intel Corporation
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_vma.c,v 1.6 2021/12/19 11:37:41 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_vma.c,v 1.7 2021/12/19 11:55:58 riastradh Exp $");
#include <linux/sched/mm.h>
#include <drm/drm_gem.h>
@@ -175,14 +175,12 @@ vma_create(struct drm_i915_gem_object *o
i915_active_init(&vma->active, __i915_vma_active, __i915_vma_retire);
-#ifndef __NetBSD__ /* XXX fs reclaim */
/* Declare ourselves safe for use inside shrinkers */
if (IS_ENABLED(CONFIG_LOCKDEP)) {
fs_reclaim_acquire(GFP_KERNEL);
might_lock(&vma->active.mutex);
fs_reclaim_release(GFP_KERNEL);
}
-#endif
INIT_LIST_HEAD(&vma->closed_link);
Index: src/sys/external/bsd/drm2/include/linux/sched/mm.h
diff -u src/sys/external/bsd/drm2/include/linux/sched/mm.h:1.2 src/sys/external/bsd/drm2/include/linux/sched/mm.h:1.3
--- src/sys/external/bsd/drm2/include/linux/sched/mm.h:1.2 Sun Dec 19 11:33:50 2021
+++ src/sys/external/bsd/drm2/include/linux/sched/mm.h Sun Dec 19 11:55:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mm.h,v 1.2 2021/12/19 11:33:50 riastradh Exp $ */
+/* $NetBSD: mm.h,v 1.3 2021/12/19 11:55:58 riastradh Exp $ */
/*-
* Copyright (c) 2021 The NetBSD Foundation, Inc.
@@ -33,6 +33,8 @@
#include <uvm/uvm_extern.h>
+#include <linux/gfp.h>
+
static inline void
mmgrab(struct vmspace *vm)
{
@@ -45,4 +47,14 @@ mmdrop(struct vmspace *vm)
uvmspace_free(vm);
}
+static inline void
+fs_reclaim_acquire(gfp_t gfp)
+{
+}
+
+static inline void
+fs_reclaim_release(gfp_t gfp)
+{
+}
+
#endif /* _LINUX_SCHED_MM_H_ */
