From: David S. Miller Date: Thu, 13 Nov 2014 20:13:13 +0000 (-0500) Subject: Merge branch 'rhash_prove_locking' X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9cf5476bfda3c2f1d5712d7bf09b3dad91fc2f2d;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git Merge branch 'rhash_prove_locking' Herbert Xu says: ==================== rhashtable: Allow local locks to be used and tested This series moves mutex_is_held entirely under PROVE_LOCKING so there is zero foot print when we're not debugging. More importantly it adds a parrent argument to mutex_is_held so that we can test local locks rather than global ones (e.g., per-namespace locks). ==================== Acked-by: Thomas Graf Signed-off-by: David S. Miller --- 9cf5476bfda3c2f1d5712d7bf09b3dad91fc2f2d