diff --git a/[refs] b/[refs] index e151af0f4ad9..1e597a72eca6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f86e82fb547efe05457391df069cce7ab530b181 +refs/heads/master: 1402c8519acba215f5a6101b9e5ada07ab371273 diff --git a/trunk/net/8021q/vlanproc.c b/trunk/net/8021q/vlanproc.c index 2a4e1aabb23b..a0ec47925597 100644 --- a/trunk/net/8021q/vlanproc.c +++ b/trunk/net/8021q/vlanproc.c @@ -220,6 +220,7 @@ static inline int is_vlan_dev(struct net_device *dev) /* start read of /proc/net/vlan/config */ static void *vlan_seq_start(struct seq_file *seq, loff_t *pos) + __acquires(dev_base_lock) { struct net_device *dev; loff_t i = 1; @@ -261,6 +262,7 @@ static void *vlan_seq_next(struct seq_file *seq, void *v, loff_t *pos) } static void vlan_seq_stop(struct seq_file *seq, void *v) + __releases(dev_base_lock) { read_unlock(&dev_base_lock); }