Patch "drm/i915: Update ifdeffery for mutex->owner" has been added to the 4.4-stable tree

This is a note to let you know that I've just added the patch titled

    drm/i915: Update ifdeffery for mutex->owner

to the 4.4-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     drm-i915-update-ifdeffery-for-mutex-owner.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let [off-list ref] know about it.

From b19240062722c39fa92c99f04cbfd93034625123 Mon Sep 17 00:00:00 2001

From: Chris Wilson <redacted>
Date: Mon, 11 Jul 2016 14:46:17 +0100
Subject: drm/i915: Update ifdeffery for mutex->owner

From: Chris Wilson <redacted>

commit b19240062722c39fa92c99f04cbfd93034625123 upstream.

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 <redacted>
Signed-off-by: Chris Wilson <redacted>
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>
(cherry picked from commit 4f074a5393431a7d2cc0de7fcfe2f61d24854628)
Signed-off-by: Daniel Vetter <redacted>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/gpu/drm/i915/i915_gem_shrinker.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/gpu/drm/i915/i915_gem_shrinker.c
+++ b/drivers/gpu/drm/i915/i915_gem_shrinker.c

@@ -39,7 +39,7 @@ static bool mutex_is_locked_by(struct mu
 	if (!mutex_is_locked(mutex))
 		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;
 #else
 	/* Since UP may be pre-empted, we cannot assume that we own the lock */

Patches currently in stable-queue which might be from chris@chris-wilson.co.uk are

queue-4.4/sched-fair-fix-cfs_rq-avg-tracking-underflow.patch
queue-4.4/drm-i915-update-ifdeffery-for-mutex-owner.patch
queue-4.4/locking-ww_mutex-report-recursive-ww_mutex-locking-early.patch