diff --git a/[refs] b/[refs] index 3f75657d0b0f..2b1387e1e1ec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 33e94e960b57497fe7fd9493080210b6d87e88e6 +refs/heads/master: 27c3b23226fc649de47e4886ccbf994482f388ba diff --git a/trunk/kernel/lockdep.c b/trunk/kernel/lockdep.c index c4ffd3c1dec4..69e92c6b0472 100644 --- a/trunk/kernel/lockdep.c +++ b/trunk/kernel/lockdep.c @@ -1276,14 +1276,6 @@ static inline int lookup_chain_cache(u64 chain_key, struct lock_class *class) if (chain->chain_key == chain_key) { cache_hit: debug_atomic_inc(&chain_lookup_hits); - /* - * In the debugging case, force redundant checking - * by returning 1: - */ -#ifdef CONFIG_DEBUG_LOCKDEP - __raw_spin_lock(&hash_lock); - return 1; -#endif if (very_verbose(class)) printk("\nhash chain already cached, key: %016Lx tail class: [%p] %s\n", chain_key, class->key, class->name); return 0;