diff --git a/[refs] b/[refs] index ae2148bc8df6..ceecbb6ed45f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e5f363e358cf16e4ad13a6826e15088c5495efe9 +refs/heads/master: 0f2bc27be27ca1dcc66b96131e44bf7648b959c6 diff --git a/trunk/kernel/lockdep.c b/trunk/kernel/lockdep.c index ab933fecd2a1..1aa91fd6b06e 100644 --- a/trunk/kernel/lockdep.c +++ b/trunk/kernel/lockdep.c @@ -2935,9 +2935,6 @@ void lock_acquire(struct lockdep_map *lock, unsigned int subclass, { unsigned long flags; - if (unlikely(!lock_stat && !prove_locking)) - return; - if (unlikely(current->lockdep_recursion)) return; @@ -2958,9 +2955,6 @@ void lock_release(struct lockdep_map *lock, int nested, { unsigned long flags; - if (unlikely(!lock_stat && !prove_locking)) - return; - if (unlikely(current->lockdep_recursion)) return;