diff --git a/[refs] b/[refs] index 9f95e102f249..b0094e6f0055 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 40ec6c542121ef85f5ba2e7d75968806009dcaf7 +refs/heads/master: bc01caf53da4de53361376734707336de8fff839 diff --git a/trunk/drivers/staging/zcache/tmem.h b/trunk/drivers/staging/zcache/tmem.h index ed147c4b110d..0d4aa82706b3 100644 --- a/trunk/drivers/staging/zcache/tmem.h +++ b/trunk/drivers/staging/zcache/tmem.h @@ -47,7 +47,7 @@ #define ASSERT_INVERTED_SENTINEL(_x, _y) do { } while (0) #endif -#define ASSERT_SPINLOCK(_l) WARN_ON(!spin_is_locked(_l)) +#define ASSERT_SPINLOCK(_l) lockdep_assert_held(_l) /* * A pool is the highest-level data structure managed by tmem and