1 From 6b29324b793709c3cef3897b7f8f3162bf01d816 Mon Sep 17 00:00:00 2001
2 From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
3 Date: Tue, 14 Jul 2015 14:26:34 +0200
4 Subject: [PATCH 246/366] gpu/i915: don't open code these things
6 The opencode part is gone in 1f83fee0 ("drm/i915: clear up wedged transitions")
7 the owner check is still there.
9 Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
11 drivers/gpu/drm/i915/i915_gem_shrinker.c | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
14 diff --git a/drivers/gpu/drm/i915/i915_gem_shrinker.c b/drivers/gpu/drm/i915/i915_gem_shrinker.c
15 index 6f10b42..dd3a9a6 100644
16 --- a/drivers/gpu/drm/i915/i915_gem_shrinker.c
17 +++ b/drivers/gpu/drm/i915/i915_gem_shrinker.c
18 @@ -40,7 +40,7 @@ static bool mutex_is_locked_by(struct mutex *mutex, struct task_struct *task)
19 if (!mutex_is_locked(mutex))
22 -#if defined(CONFIG_DEBUG_MUTEXES) || defined(CONFIG_MUTEX_SPIN_ON_OWNER)
23 +#if (defined(CONFIG_DEBUG_MUTEXES) || defined(CONFIG_MUTEX_SPIN_ON_OWNER)) && !defined(CONFIG_PREEMPT_RT_BASE)
24 return mutex->owner == task;
26 /* Since UP may be pre-empted, we cannot assume that we own the lock */