Merge mulgrave-w:git/linux-2.6

Conflicts:

	include/linux/blkdev.h

Trivial merge to incorporate tag prototypes.

1 files changed, 3 insertions, 4 deletions

diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
index 99c0cefc04e0..249e5033c1a8 100644
--- a/net/sctp/ipv6.c
+++ b/net/sctp/ipv6.c
@@ -78,7 +78,6 @@
 
 #include <asm/uaccess.h>
 
-extern int sctp_inetaddr_event(struct notifier_block *, unsigned long, void *);
 static struct notifier_block sctp_inet6addr_notifier = {
         .notifier_call = sctp_inetaddr_event,
 };
@@ -322,9 +321,9 @@ static void sctp_v6_copy_addrlist(struct list_head *addrlist,
         struct inet6_ifaddr *ifp;
         struct sctp_sockaddr_entry *addr;
 
-        read_lock(&addrconf_lock);
+        rcu_read_lock();
         if ((in6_dev = __in6_dev_get(dev)) == NULL) {
-                read_unlock(&addrconf_lock);
+                rcu_read_unlock();
                 return;
         }
 
@@ -343,7 +342,7 @@ static void sctp_v6_copy_addrlist(struct list_head *addrlist,
         }
 
         read_unlock(&in6_dev->lock);
-        read_unlock(&addrconf_lock);
+        rcu_read_unlock();
 }
 
 /* Initialize a sockaddr_storage from in incoming skb. */