Merge branches 'release', 'asus', 'sony-laptop' and 'thinkpad' into release

[linux-2.6-omap-h63xx.git] / net / ax25 / ax25_route.c

diff --git a/net/ax25/ax25_route.c b/net/ax25/ax25_route.c
index d65b8e22868d9a4c5e1f7a47ddbbfa3cc21080d9..38c7f3087ec3d17c1fc8a5ff48be10cb9dedda60 100644 (file)
--- a/net/ax25/ax25_route.c
+++ b/net/ax25/ax25_route.c
@@ -249,6 +249,7 @@ int ax25_rt_ioctl(unsigned int cmd, void __user *arg)
 #ifdef CONFIG_PROC_FS
 
 static void *ax25_rt_seq_start(struct seq_file *seq, loff_t *pos)
+       __acquires(ax25_route_lock)
 {
        struct ax25_route *ax25_rt;
        int i = 1;
@@ -274,6 +275,7 @@ static void *ax25_rt_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 }
 
 static void ax25_rt_seq_stop(struct seq_file *seq, void *v)
+       __releases(ax25_route_lock)
 {
        read_unlock(&ax25_route_lock);
 }
@@ -320,7 +322,7 @@ static int ax25_rt_seq_show(struct seq_file *seq, void *v)
        return 0;
 }
 
-static struct seq_operations ax25_rt_seqops = {
+static const struct seq_operations ax25_rt_seqops = {
        .start = ax25_rt_seq_start,
        .next = ax25_rt_seq_next,
        .stop = ax25_rt_seq_stop,