r8169: update the phy init for the 8168C

[linux-2.6-omap-h63xx.git] / kernel / lockdep_proc.c

diff --git a/kernel/lockdep_proc.c b/kernel/lockdep_proc.c
index 39163ed1bf0a9879c02954764bd50ff52de35ea3..8a135bd163c2cc719b4635b1e511aa87039d6f46 100644 (file)
--- a/kernel/lockdep_proc.c
+++ b/kernel/lockdep_proc.c
@@ -25,28 +25,38 @@
 
 static void *l_next(struct seq_file *m, void *v, loff_t *pos)
 {
-       struct lock_class *class = v;
+       struct lock_class *class;
 
        (*pos)++;
 
-       if (class->lock_entry.next != &all_lock_classes)
-               class = list_entry(class->lock_entry.next, struct lock_class,
-                                 lock_entry);
-       else
-               class = NULL;
-       m->private = class;
+       if (v == SEQ_START_TOKEN)
+               class = m->private;
+       else {
+               class = v;
+
+               if (class->lock_entry.next != &all_lock_classes)
+                       class = list_entry(class->lock_entry.next,
+                                          struct lock_class, lock_entry);
+               else
+                       class = NULL;
+       }
 
        return class;
 }
 
 static void *l_start(struct seq_file *m, loff_t *pos)
 {
-       struct lock_class *class = m->private;
+       struct lock_class *class;
+       loff_t i = 0;
 
-       if (&class->lock_entry == all_lock_classes.next)
-               seq_printf(m, "all lock classes:\n");
+       if (*pos == 0)
+               return SEQ_START_TOKEN;
 
-       return class;
+       list_for_each_entry(class, &all_lock_classes, lock_entry) {
+               if (++i == *pos)
+               return class;
+       }
+       return NULL;
 }
 
 static void l_stop(struct seq_file *m, void *v)
@@ -101,10 +111,15 @@ static void print_name(struct seq_file *m, struct lock_class *class)
 static int l_show(struct seq_file *m, void *v)
 {
        unsigned long nr_forward_deps, nr_backward_deps;
-       struct lock_class *class = m->private;
+       struct lock_class *class = v;
        struct lock_list *entry;
        char c1, c2, c3, c4;
 
+       if (v == SEQ_START_TOKEN) {
+               seq_printf(m, "all lock classes:\n");
+               return 0;
+       }
+
        seq_printf(m, "%p", class->key);
 #ifdef CONFIG_DEBUG_LOCKDEP
        seq_printf(m, " OPS:%8ld", class->ops);
@@ -346,7 +361,7 @@ static const struct file_operations proc_lockdep_stats_operations = {
        .open           = lockdep_stats_open,
        .read           = seq_read,
        .llseek         = seq_lseek,
-       .release        = seq_release,
+       .release        = single_release,
 };
 
 #ifdef CONFIG_LOCK_STAT
@@ -421,8 +436,30 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
        class = data->class;
        stats = &data->stats;
 
-       snprintf(name, 38, "%s", class->name);
+       namelen = 38;
+       if (class->name_version > 1)
+               namelen -= 2; /* XXX truncates versions > 9 */
+       if (class->subclass)
+               namelen -= 2;
+
+       if (!class->name) {
+               char str[KSYM_NAME_LEN];
+               const char *key_name;
+
+               key_name = __get_key_name(class->key, str);
+               snprintf(name, namelen, "%s", key_name);
+       } else {
+               snprintf(name, namelen, "%s", class->name);
+       }
        namelen = strlen(name);
+       if (class->name_version > 1) {
+               snprintf(name+namelen, 3, "#%d", class->name_version);
+               namelen += 2;
+       }
+       if (class->subclass) {
+               snprintf(name+namelen, 3, "/%d", class->subclass);
+               namelen += 2;
+       }
 
        if (stats->write_holdtime.nr) {
                if (stats->read_holdtime.nr)
@@ -430,16 +467,18 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
                else
                        seq_printf(m, "%40s:", name);
 
+               seq_printf(m, "%14lu ", stats->bounces[bounce_contended_write]);
                seq_lock_time(m, &stats->write_waittime);
-               seq_puts(m, " ");
+               seq_printf(m, " %14lu ", stats->bounces[bounce_acquired_write]);
                seq_lock_time(m, &stats->write_holdtime);
                seq_puts(m, "\n");
        }
 
        if (stats->read_holdtime.nr) {
                seq_printf(m, "%38s-R:", name);
+               seq_printf(m, "%14lu ", stats->bounces[bounce_contended_read]);
                seq_lock_time(m, &stats->read_waittime);
-               seq_puts(m, " ");
+               seq_printf(m, " %14lu ", stats->bounces[bounce_acquired_read]);
                seq_lock_time(m, &stats->read_holdtime);
                seq_puts(m, "\n");
        }
@@ -469,26 +508,29 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
        }
        if (i) {
                seq_puts(m, "\n");
-               seq_line(m, '.', 0, 40 + 1 + 8 * (14 + 1));
+               seq_line(m, '.', 0, 40 + 1 + 10 * (14 + 1));
                seq_puts(m, "\n");
        }
 }
 
 static void seq_header(struct seq_file *m)
 {
-       seq_printf(m, "lock_stat version 0.1\n");
-       seq_line(m, '-', 0, 40 + 1 + 8 * (14 + 1));
-       seq_printf(m, "%40s %14s %14s %14s %14s %14s %14s %14s %14s\n",
+       seq_printf(m, "lock_stat version 0.2\n");
+       seq_line(m, '-', 0, 40 + 1 + 10 * (14 + 1));
+       seq_printf(m, "%40s %14s %14s %14s %14s %14s %14s %14s %14s "
+                       "%14s %14s\n",
                        "class name",
+                       "con-bounces",
                        "contentions",
                        "waittime-min",
                        "waittime-max",
                        "waittime-total",
+                       "acq-bounces",
                        "acquisitions",
                        "holdtime-min",
                        "holdtime-max",
                        "holdtime-total");
-       seq_line(m, '-', 0, 40 + 1 + 8 * (14 + 1));
+       seq_line(m, '-', 0, 40 + 1 + 10 * (14 + 1));
        seq_printf(m, "\n");
 }
 
@@ -496,10 +538,11 @@ static void *ls_start(struct seq_file *m, loff_t *pos)
 {
        struct lock_stat_seq *data = m->private;
 
-       if (data->iter == data->stats)
-               seq_header(m);
+       if (*pos == 0)
+               return SEQ_START_TOKEN;
 
-       if (data->iter == data->iter_end)
+       data->iter = data->stats + *pos;
+       if (data->iter >= data->iter_end)
                data->iter = NULL;
 
        return data->iter;
@@ -511,8 +554,13 @@ static void *ls_next(struct seq_file *m, void *v, loff_t *pos)
 
        (*pos)++;
 
-       data->iter = v;
-       data->iter++;
+       if (v == SEQ_START_TOKEN)
+               data->iter = data->stats;
+       else {
+               data->iter = v;
+               data->iter++;
+       }
+
        if (data->iter == data->iter_end)
                data->iter = NULL;
 
@@ -525,9 +573,11 @@ static void ls_stop(struct seq_file *m, void *v)
 
 static int ls_show(struct seq_file *m, void *v)
 {
-       struct lock_stat_seq *data = m->private;
+       if (v == SEQ_START_TOKEN)
+               seq_header(m);
+       else
+               seq_stats(m, v);
 
-       seq_stats(m, data->iter);
        return 0;
 }