diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-01-28 15:42:56 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-01-28 15:42:56 +0100 |
| commit | f10698ed6807dc41d021fb7baeb24f9bc4051837 (patch) | |
| tree | fe9229efe38ad31788843a7535bfc3feb89f79a7 /drivers/gpu/drm/i915/i915_gem.c | |
| parent | 86038c5ea81b519a8a1fcfcd5e4599aab0cdd119 (diff) | |
| parent | e742f3dc0886a92403d578e8ac771e5e33d06d08 (diff) | |
| download | talos-op-linux-f10698ed6807dc41d021fb7baeb24f9bc4051837.tar.gz talos-op-linux-f10698ed6807dc41d021fb7baeb24f9bc4051837.zip | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index c11603b4cf1d..76354d3ba925 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -5155,7 +5155,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) return mutex->owner == task; #else /* Since UP may be pre-empted, we cannot assume that we own the lock */ |
