Merge branch 'dmaengine' into async-tx-next

Conflicts:
	crypto/async_tx/async_xor.c
	drivers/dma/ioat/dma_v2.h
	drivers/dma/ioat/pci.c
	drivers/md/raid5.c

1 files changed, 4 insertions, 5 deletions

diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
index 3be0e016ab7d..ce51ce012cda 100644
--- a/net/netrom/af_netrom.c
+++ b/net/netrom/af_netrom.c
@@ -286,8 +286,7 @@ void nr_destroy_socket(struct sock *sk)
                 kfree_skb(skb);
         }
 
-        if (atomic_read(&sk->sk_wmem_alloc) ||
-            atomic_read(&sk->sk_rmem_alloc)) {
+        if (sk_has_allocations(sk)) {
                 /* Defer: outstanding buffers */
                 sk->sk_timer.function = nr_destroy_timer;
                 sk->sk_timer.expires  = jiffies + 2 * HZ;
@@ -1206,7 +1205,7 @@ static int nr_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                 long amount;
 
                 lock_sock(sk);
-                amount = sk->sk_sndbuf - atomic_read(&sk->sk_wmem_alloc);
+                amount = sk->sk_sndbuf - sk_wmem_alloc_get(sk);
                 if (amount < 0)
                         amount = 0;
                 release_sock(sk);
@@ -1342,8 +1341,8 @@ static int nr_info_show(struct seq_file *seq, void *v)
                         nr->n2count,
                         nr->n2,
                         nr->window,
-                        atomic_read(&s->sk_wmem_alloc),
-                        atomic_read(&s->sk_rmem_alloc),
+                        sk_wmem_alloc_get(s),
+                        sk_rmem_alloc_get(s),
                         s->sk_socket ? SOCK_INODE(s->sk_socket)->i_ino : 0L);
 
                 bh_unlock_sock(s);