Commit-ID: 43496d35513b25ad468bef91e51a39d61a0d8464 Gitweb: http://git.kernel.org/tip/43496d35513b25ad468bef91e51a39d61a0d8464 Author: Ingo Molnar <mingo@xxxxxxxxxx> AuthorDate: Wed, 16 Nov 2016 10:36:05 +0100 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitDate: Wed, 16 Nov 2016 10:39:43 +0100 locking/mutex: Don't mark mutex_trylock_recursive() as deprecated, temporarily Until the DRM drivers are fixed to not use mutex_trylock_recursive(), allyes/modconfig builds will emit an API deprecation warning: drivers/gpu/drm/i915/i915_gem_shrinker.c: In function ‘i915_gem_shrinker_lock’: drivers/gpu/drm/i915/i915_gem_shrinker.c:230:2: warning: ‘mutex_trylock_recursive’ is deprecated [-Wdeprecated-declarations] switch (mutex_trylock_recursive(&dev->struct_mutex)) { ^ Don't pollute the kernel log until the DRM code is fixed. Hopefully the checkpatch warning is enough to keep people from using this new API, and we'll be NAK-ing new users as well. Cc: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> Cc: Daniel Vetter <daniel.vetter@xxxxxxxx> Cc: David Airlie <airlied@xxxxxxxx> Cc: Davidlohr Bueso <dave@xxxxxxxxxxxx> Cc: Ding Tianhong <dingtianhong@xxxxxxxxxx> Cc: Imre Deak <imre.deak@xxxxxxxxx> Cc: Jason Low <jason.low2@xxxxxxx> Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> Cc: Paul E. McKenney <paulmck@xxxxxxxxxx> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Cc: Rob Clark <robdclark@xxxxxxxxx> Cc: Terry Rudd <terry.rudd@xxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: Tim Chen <tim.c.chen@xxxxxxxxxxxxxxx> Cc: Will Deacon <Will.Deacon@xxxxxxx> Cc: dri-devel@xxxxxxxxxxxxxxxxxxxxx Cc: linux-kernel@xxxxxxxxxxxxxxx Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> --- include/linux/mutex.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/mutex.h b/include/linux/mutex.h index 6a902f0..b97870f 100644 --- a/include/linux/mutex.h +++ b/include/linux/mutex.h @@ -211,7 +211,7 @@ enum mutex_trylock_recursive_enum { * MUTEX_TRYLOCK_SUCCESS - lock acquired, * MUTEX_TRYLOCK_RECURSIVE - we already owned the lock. */ -static inline __deprecated __must_check enum mutex_trylock_recursive_enum +static inline /* __deprecated */ __must_check enum mutex_trylock_recursive_enum mutex_trylock_recursive(struct mutex *lock) { if (unlikely(__mutex_owner(lock) == current)) -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
![]() |