Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / net / wanrouter / wanproc.c

diff --git a/net/wanrouter/wanproc.c b/net/wanrouter/wanproc.c
index 267f7ff498270e3f397430d20f72cf151fb2217e..c44d96b3a437a6019ba254b99877cc7ee025f765 100644 (file)
--- a/net/wanrouter/wanproc.c
+++ b/net/wanrouter/wanproc.c
@@ -80,6 +80,7 @@ static struct proc_dir_entry *proc_router;
  *     Iterator
  */
 static void *r_start(struct seq_file *m, loff_t *pos)
+       __acquires(kernel_lock)
 {
        struct wan_device *wandev;
        loff_t l = *pos;
@@ -101,6 +102,7 @@ static void *r_next(struct seq_file *m, void *v, loff_t *pos)
 }
 
 static void r_stop(struct seq_file *m, void *v)
+       __releases(kernel_lock)
 {
        unlock_kernel();
 }