Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:18:28 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_gem_shrinker.c
Log Message:
Horrible kludgey mutex_is_locked_by that should work here.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_shrinker.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/i915/i915_gem_shrinker.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_shrinker.c:1.2 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_shrinker.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_shrinker.c:1.2 Mon Aug 27 04:58:23 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_shrinker.c Mon Aug 27 07:18:28 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_gem_shrinker.c,v 1.2 2018/08/27 04:58:23 riastradh Exp $ */
+/* $NetBSD: i915_gem_shrinker.c,v 1.3 2018/08/27 07:18:28 riastradh Exp $ */
/*
* Copyright © 2008-2015 Intel Corporation
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_gem_shrinker.c,v 1.2 2018/08/27 04:58:23 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem_shrinker.c,v 1.3 2018/08/27 07:18:28 riastradh Exp $");
#include <linux/oom.h>
#include <linux/shmem_fs.h>
@@ -39,6 +39,16 @@ __KERNEL_RCSID(0, "$NetBSD: i915_gem_shr
#include "i915_drv.h"
#include "i915_trace.h"
+#ifdef __NetBSD__
+/* XXX argh argh argh argh argh argh argh argh */
+static bool mutex_is_locked_by(struct mutex *mutex, struct proc *proc)
+{
+
+ KASSERT(proc == curproc);
+ /* Actually answers `do we own mutex?'. */
+ return mutex_is_locked(mutex);
+}
+#else
static bool mutex_is_locked_by(struct mutex *mutex, struct task_struct *task)
{
if (!mutex_is_locked(mutex))
@@ -51,6 +61,7 @@ static bool mutex_is_locked_by(struct mu
return false;
#endif
}
+#endif
/**
* i915_gem_shrink - Shrink buffer object caches
