[PATCH] lockdep: clean up VERY_VERBOSE define

[pandora-kernel.git] / kernel / lockdep.c

diff --git a/kernel/lockdep.c b/kernel/lockdep.c
index b020324..c4ffd3c 100644 (file)
--- a/kernel/lockdep.c
+++ b/kernel/lockdep.c
@@ -145,9 +145,7 @@ EXPORT_SYMBOL(lockdep_on);
  */
 
 #define VERBOSE                        0
-#ifdef VERBOSE
-# define VERY_VERBOSE          0
-#endif
+#define VERY_VERBOSE           0
 
 #if VERBOSE
 # define HARDIRQ_VERBOSE       1
@@ -172,8 +170,8 @@ static int class_filter(struct lock_class *class)
                        !strcmp(class->name, "&struct->lockfield"))
                return 1;
 #endif
-       /* Allow everything else. 0 would be filter everything else */
-       return 1;
+       /* Filter everything else. 1 would be to allow everything else */
+       return 0;
 }
 #endif
 
@@ -1264,7 +1262,7 @@ out_unlock_set:
  * add it and return 0 - in this case the new dependency chain is
  * validated. If the key is already hashed, return 1.
  */
-static inline int lookup_chain_cache(u64 chain_key)
+static inline int lookup_chain_cache(u64 chain_key, struct lock_class *class)
 {
        struct list_head *hash_head = chainhashentry(chain_key);
        struct lock_chain *chain;
@@ -1286,9 +1284,13 @@ cache_hit:
                        __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;
                }
        }
+       if (very_verbose(class))
+               printk("\nnew hash chain, key: %016Lx tail class: [%p] %s\n", chain_key, class->key, class->name);
        /*
         * Allocate a new chain entry from the static array, and add
         * it to the hash:
@@ -2139,7 +2141,7 @@ out_calc_hash:
         * (If lookup_chain_cache() returns with 1 it acquires
         * hash_lock for us)
         */
-       if (!trylock && (check == 2) && lookup_chain_cache(chain_key)) {
+       if (!trylock && (check == 2) && lookup_chain_cache(chain_key, class)) {
                /*
                 * Check whether last held lock:
                 *
@@ -2433,6 +2435,7 @@ EXPORT_SYMBOL_GPL(lock_release);
 void lockdep_reset(void)
 {
        unsigned long flags;
+       int i;
 
        raw_local_irq_save(flags);
        current->curr_chain_key = 0;
@@ -2443,6 +2446,8 @@ void lockdep_reset(void)
        nr_softirq_chains = 0;
        nr_process_chains = 0;
        debug_locks = 1;
+       for (i = 0; i < CHAINHASH_SIZE; i++)
+               INIT_LIST_HEAD(chainhash_table + i);
        raw_local_irq_restore(flags);
 }