Pull cpuidle into release branch

[linux-2.6] / drivers / s390 / net / qeth_proc.c

diff --git a/drivers/s390/net/qeth_proc.c b/drivers/s390/net/qeth_proc.c
index 81f805cc5ee7a3e2723952d00e0a502f43dc3ff2..f1ff165a5e052a3e2a180290c9de41f97b2eeba5 100644 (file)
--- a/drivers/s390/net/qeth_proc.c
+++ b/drivers/s390/net/qeth_proc.c
@@ -37,7 +37,6 @@ qeth_procfile_seq_start(struct seq_file *s, loff_t *offset)
        struct device *dev = NULL;
        loff_t nr = 0;
 
-       down_read(&qeth_ccwgroup_driver.driver.bus->subsys.rwsem);
        if (*offset == 0)
                return SEQ_START_TOKEN;
        while (1) {
@@ -53,7 +52,6 @@ qeth_procfile_seq_start(struct seq_file *s, loff_t *offset)
 static void
 qeth_procfile_seq_stop(struct seq_file *s, void* it)
 {
-       up_read(&qeth_ccwgroup_driver.driver.bus->subsys.rwsem);
 }
 
 static void *
@@ -214,6 +212,12 @@ qeth_perf_procfile_seq_show(struct seq_file *s, void *it)
                      "  Skb fragments sent in SG mode          : %u\n\n",
                      card->perf_stats.sg_skbs_sent,
                      card->perf_stats.sg_frags_sent);
+       seq_printf(s, "  Skbs received in SG mode               : %u\n"
+                     "  Skb fragments received in SG mode      : %u\n"
+                     "  Page allocations for rx SG mode        : %u\n\n",
+                     card->perf_stats.sg_skbs_rx,
+                     card->perf_stats.sg_frags_rx,
+                     card->perf_stats.sg_alloc_page_rx);
        seq_printf(s, "  large_send tx (in Kbytes)              : %u\n"
                      "  large_send count                       : %u\n\n",
                      card->perf_stats.large_send_bytes >> 10,