Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

drm/i915: Update ifdeffery for mutex->owner

In commit 7608a43d8f2e ("locking/mutexes: Use MUTEX_SPIN_ON_OWNER when
appropriate") the owner field in the mutex was updated from being
dependent upon CONFIG_SMP to using optimistic spin. Update our peek
function to suite.

Fixes:7608a43d8f2e ("locking/mutexes: Use MUTEX_SPIN_ON_OWNER...")
Reported-by: Hong Liu <hong.liu@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1468244777-4888-1-git-send-email-chris@chris-wilson.co.uk
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Chris Wilson 9 years ago
parent
1b290f97c8
commit
4f074a5393
1 changed files with 1 additions and 1 deletions
Unified View Show Diff Stats
  1. 1 1
      drivers/gpu/drm/i915/i915_gem_shrinker.c

+ 1 - 1
drivers/gpu/drm/i915/i915_gem_shrinker.c
View File 

@@ -40,7 +40,7 @@ static bool mutex_is_locked_by(struct mutex *mutex, struct task_struct *task)
 
 	if (!mutex_is_locked(mutex))
 
 	if (!mutex_is_locked(mutex))
 
 		return false;
 
 		return false;
 
 
 
-#if defined(CONFIG_SMP) || defined(CONFIG_DEBUG_MUTEXES)
 
+#if defined(CONFIG_DEBUG_MUTEXES) || defined(CONFIG_MUTEX_SPIN_ON_OWNER)
 
 	return mutex->owner == task;
 
 	return mutex->owner == task;
 
 #else
 
 #else
 
 	/* Since UP may be pre-empted, we cannot assume that we own the lock */
 
 	/* Since UP may be pre-empted, we cannot assume that we own the lock */