forked from rrcarlosr/Jetpack
41 lines
1.7 KiB
Diff
41 lines
1.7 KiB
Diff
From f8283c2d158caa602bfe875945f88aca01400720 Mon Sep 17 00:00:00 2001
|
|
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
Date: Tue, 14 Jul 2015 14:26:34 +0200
|
|
Subject: [PATCH 164/352] gpu: don't check for the lock owner.
|
|
|
|
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
---
|
|
drivers/gpu/drm/i915/i915_gem_shrinker.c | 2 +-
|
|
drivers/gpu/drm/msm/msm_gem_shrinker.c | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/drivers/gpu/drm/i915/i915_gem_shrinker.c b/drivers/gpu/drm/i915/i915_gem_shrinker.c
|
|
index 755d788..97fb03d 100644
|
|
--- a/drivers/gpu/drm/i915/i915_gem_shrinker.c
|
|
+++ b/drivers/gpu/drm/i915/i915_gem_shrinker.c
|
|
@@ -40,7 +40,7 @@ static bool mutex_is_locked_by(struct mutex *mutex, struct task_struct *task)
|
|
if (!mutex_is_locked(mutex))
|
|
return false;
|
|
|
|
-#if defined(CONFIG_DEBUG_MUTEXES) || defined(CONFIG_MUTEX_SPIN_ON_OWNER)
|
|
+#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 */
|
|
diff --git a/drivers/gpu/drm/msm/msm_gem_shrinker.c b/drivers/gpu/drm/msm/msm_gem_shrinker.c
|
|
index 192b2d3..d5372a2 100644
|
|
--- a/drivers/gpu/drm/msm/msm_gem_shrinker.c
|
|
+++ b/drivers/gpu/drm/msm/msm_gem_shrinker.c
|
|
@@ -23,7 +23,7 @@ static bool mutex_is_locked_by(struct mutex *mutex, struct task_struct *task)
|
|
if (!mutex_is_locked(mutex))
|
|
return false;
|
|
|
|
-#if defined(CONFIG_SMP) || defined(CONFIG_DEBUG_MUTEXES)
|
|
+#if (defined(CONFIG_SMP) || defined(CONFIG_DEBUG_MUTEXES)) && !defined(CONFIG_PREEMPT_RT_BASE)
|
|
return mutex->owner == task;
|
|
#else
|
|
/* Since UP may be pre-empted, we cannot assume that we own the lock */
|
|
--
|
|
2.7.4
|
|
|