From 1b9aa48440aa09c18aa048bf1bf5664b33618c4d Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Mon, 21 Jan 2008 17:27:44 -0800
Subject: [PATCH] --- yaml --- r: 79450 b: refs/heads/master c:
 1402c8519acba215f5a6101b9e5ada07ab371273 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/net/8021q/vlanproc.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

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);
 }