locking/lockdep: Revert qrwlock recusive stuff

[linux-2.6-block.git] / kernel / locking / lockdep.c

diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index 420ba685c4e5bf43765ae40ebd9bc46e9cb9d624..88d0d4420ad2e3e47e71129d361b153c96a49e18 100644 (file)
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -3597,12 +3597,6 @@ void lock_acquire(struct lockdep_map *lock, unsigned int subclass,
        raw_local_irq_save(flags);
        check_flags(flags);
 
-       /*
-        * An interrupt recursive read in interrupt context can be considered
-        * to be the same as a recursive read from checking perspective.
-        */
-       if ((read == 3) && in_interrupt())
-               read = 2;
        current->lockdep_recursion = 1;
        trace_lock_acquire(lock, subclass, trylock, read, check, nest_lock, ip);
        __lock_acquire(lock, subclass, trylock, read, check,