Merge commit 'v2.6.28-rc6' into x86/debug

1 files changed, 1 insertions, 2 deletions

diff --git a/include/net/sock.h b/include/net/sock.h
index ada50c04d09f..2f47107f6d0f 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -815,7 +815,7 @@ static inline void sk_wmem_free_skb(struct sock *sk, struct sk_buff *skb)
  */
 #define sock_lock_init_class_and_name(sk, sname, skey, name, key)       \
 do {                                                                    \
-        sk->sk_lock.owned = 0;                                  \
+        sk->sk_lock.owned = 0;                                          \
         init_waitqueue_head(&sk->sk_lock.wq);                           \
         spin_lock_init(&(sk)->sk_lock.slock);                           \
         debug_check_no_locks_freed((void *)&(sk)->sk_lock,              \
@@ -936,7 +936,6 @@ extern void sock_init_data(struct socket *sock, struct sock *sk);
 
 /**
  *      sk_filter_release: Release a socket filter
- *      @sk: socket
  *      @fp: filter to remove
  *
  *      Remove a filter from a socket and release its resources.