Merge tag 'platform-drivers-x86-v4.13-1' of git://git.infradead.org/linux-platform...

[karo-tx-linux.git] / include / net / af_unix.h

diff --git a/include/net/af_unix.h b/include/net/af_unix.h
index fd60eccb59a67969eba53416a376a3c912d62d81..678e4d6fa31766d64e93a17bc33a81e5d9b634bf 100644 (file)
--- a/include/net/af_unix.h
+++ b/include/net/af_unix.h
@@ -4,6 +4,7 @@
 #include <linux/socket.h>
 #include <linux/un.h>
 #include <linux/mutex.h>
+#include <linux/refcount.h>
 #include <net/sock.h>
 
 void unix_inflight(struct user_struct *user, struct file *fp);
@@ -21,7 +22,7 @@ extern spinlock_t unix_table_lock;
 extern struct hlist_head unix_socket_table[2 * UNIX_HASH_SIZE];
 
 struct unix_address {
-       atomic_t        refcnt;
+       refcount_t      refcnt;
        int             len;
        unsigned int    hash;
        struct sockaddr_un name[0];
@@ -62,7 +63,7 @@ struct unix_sock {
 #define UNIX_GC_CANDIDATE      0
 #define UNIX_GC_MAYBE_CYCLE    1
        struct socket_wq        peer_wq;
-       wait_queue_t            peer_wake;
+       wait_queue_entry_t              peer_wake;
 };
 
 static inline struct unix_sock *unix_sk(const struct sock *sk)