diff options
-rw-r--r-- | net/wanrouter/wanmain.c | 8 | ||||
-rw-r--r-- | net/wanrouter/wanproc.c | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/net/wanrouter/wanmain.c b/net/wanrouter/wanmain.c index 39701dec1dba..466e2d22d256 100644 --- a/net/wanrouter/wanmain.c +++ b/net/wanrouter/wanmain.c | |||
@@ -86,8 +86,10 @@ static int wanrouter_device_del_if(struct wan_device *wandev, | |||
86 | 86 | ||
87 | static struct wan_device *wanrouter_find_device(char *name); | 87 | static struct wan_device *wanrouter_find_device(char *name); |
88 | static int wanrouter_delete_interface(struct wan_device *wandev, char *name); | 88 | static int wanrouter_delete_interface(struct wan_device *wandev, char *name); |
89 | static void lock_adapter_irq(spinlock_t *lock, unsigned long *smp_flags); | 89 | static void lock_adapter_irq(spinlock_t *lock, unsigned long *smp_flags) |
90 | static void unlock_adapter_irq(spinlock_t *lock, unsigned long *smp_flags); | 90 | __acquires(lock); |
91 | static void unlock_adapter_irq(spinlock_t *lock, unsigned long *smp_flags) | ||
92 | __releases(lock); | ||
91 | 93 | ||
92 | 94 | ||
93 | 95 | ||
@@ -763,12 +765,14 @@ static int wanrouter_delete_interface(struct wan_device *wandev, char *name) | |||
763 | } | 765 | } |
764 | 766 | ||
765 | static void lock_adapter_irq(spinlock_t *lock, unsigned long *smp_flags) | 767 | static void lock_adapter_irq(spinlock_t *lock, unsigned long *smp_flags) |
768 | __acquires(lock) | ||
766 | { | 769 | { |
767 | spin_lock_irqsave(lock, *smp_flags); | 770 | spin_lock_irqsave(lock, *smp_flags); |
768 | } | 771 | } |
769 | 772 | ||
770 | 773 | ||
771 | static void unlock_adapter_irq(spinlock_t *lock, unsigned long *smp_flags) | 774 | static void unlock_adapter_irq(spinlock_t *lock, unsigned long *smp_flags) |
775 | __releases(lock) | ||
772 | { | 776 | { |
773 | spin_unlock_irqrestore(lock, *smp_flags); | 777 | spin_unlock_irqrestore(lock, *smp_flags); |
774 | } | 778 | } |
diff --git a/net/wanrouter/wanproc.c b/net/wanrouter/wanproc.c index 267f7ff49827..c44d96b3a437 100644 --- a/net/wanrouter/wanproc.c +++ b/net/wanrouter/wanproc.c | |||
@@ -80,6 +80,7 @@ static struct proc_dir_entry *proc_router; | |||
80 | * Iterator | 80 | * Iterator |
81 | */ | 81 | */ |
82 | static void *r_start(struct seq_file *m, loff_t *pos) | 82 | static void *r_start(struct seq_file *m, loff_t *pos) |
83 | __acquires(kernel_lock) | ||
83 | { | 84 | { |
84 | struct wan_device *wandev; | 85 | struct wan_device *wandev; |
85 | loff_t l = *pos; | 86 | loff_t l = *pos; |
@@ -101,6 +102,7 @@ static void *r_next(struct seq_file *m, void *v, loff_t *pos) | |||
101 | } | 102 | } |
102 | 103 | ||
103 | static void r_stop(struct seq_file *m, void *v) | 104 | static void r_stop(struct seq_file *m, void *v) |
105 | __releases(kernel_lock) | ||
104 | { | 106 | { |
105 | unlock_kernel(); | 107 | unlock_kernel(); |
106 | } | 108 | } |