Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
drivers
/
gpu
/
drm
/
i915
/
i915_gem_shrinker.c
diff --git
a/kernel/drivers/gpu/drm/i915/i915_gem_shrinker.c
b/kernel/drivers/gpu/drm/i915/i915_gem_shrinker.c
index
9686fa2
..
deb1e20
100644
(file)
--- a/
kernel/drivers/gpu/drm/i915/i915_gem_shrinker.c
+++ b/
kernel/drivers/gpu/drm/i915/i915_gem_shrinker.c
@@
-39,7
+39,7
@@
static bool mutex_is_locked_by(struct mutex *mutex, struct task_struct *task)
if (!mutex_is_locked(mutex))
return false;
if (!mutex_is_locked(mutex))
return false;
-#if (defined(CONFIG_
SMP) || defined(CONFIG_DEBUG_MUTEXES
)) && !defined(CONFIG_PREEMPT_RT_BASE)
+#if (defined(CONFIG_
DEBUG_MUTEXES) || defined(CONFIG_MUTEX_SPIN_ON_OWNER
)) && !defined(CONFIG_PREEMPT_RT_BASE)
return mutex->owner == task;
#else
/* Since UP may be pre-empted, we cannot assume that we own the lock */
return mutex->owner == task;
#else
/* Since UP may be pre-empted, we cannot assume that we own the lock */