10 files changed, 27 insertions, 29 deletions

diff --git a/crypto/algapi.c b/crypto/algapi.c
index 3e4524e6139b..76fae27ed01c 100644
--- a/crypto/algapi.c
+++ b/crypto/algapi.c
@@ -17,6 +17,7 @@
 #include <linux/list.h>
 #include <linux/module.h>
 #include <linux/rtnetlink.h>
+#include <linux/slab.h>
 #include <linux/string.h>
 
 #include "internal.h"
diff --git a/crypto/algboss.c b/crypto/algboss.c
index 412241ce4cfa..c3c196b5823a 100644
--- a/crypto/algboss.c
+++ b/crypto/algboss.c
@@ -19,6 +19,7 @@
 #include <linux/notifier.h>
 #include <linux/rtnetlink.h>
 #include <linux/sched.h>
+#include <linux/slab.h>
 #include <linux/string.h>
 
 #include "internal.h"
diff --git a/crypto/async_tx/async_pq.c b/crypto/async_tx/async_pq.c
index ec87f53d5059..fdd8257d35d9 100644
--- a/crypto/async_tx/async_pq.c
+++ b/crypto/async_tx/async_pq.c
@@ -24,6 +24,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/raid/pq.h>
 #include <linux/async_tx.h>
+#include <linux/gfp.h>
 
 /**
  * pq_scribble_page - space to hold throwaway P or Q buffer for
diff --git a/crypto/async_tx/async_tx.c b/crypto/async_tx/async_tx.c
index f9cdf04fe7c0..7f2c00a45205 100644
--- a/crypto/async_tx/async_tx.c
+++ b/crypto/async_tx/async_tx.c
@@ -81,18 +81,13 @@ async_tx_channel_switch(struct dma_async_tx_descriptor *depend_tx,
         struct dma_device *device = chan->device;
         struct dma_async_tx_descriptor *intr_tx = (void *) ~0;
 
-        #ifdef CONFIG_ASYNC_TX_DISABLE_CHANNEL_SWITCH
-        BUG();
-        #endif
-
         /* first check to see if we can still append to depend_tx */
-        spin_lock_bh(&depend_tx->lock);
-        if (depend_tx->parent && depend_tx->chan == tx->chan) {
-                tx->parent = depend_tx;
-                depend_tx->next = tx;
+        txd_lock(depend_tx);
+        if (txd_parent(depend_tx) && depend_tx->chan == tx->chan) {
+                txd_chain(depend_tx, tx);
                 intr_tx = NULL;
         }
-        spin_unlock_bh(&depend_tx->lock);
+        txd_unlock(depend_tx);
 
         /* attached dependency, flush the parent channel */
         if (!intr_tx) {
@@ -111,24 +106,22 @@ async_tx_channel_switch(struct dma_async_tx_descriptor *depend_tx,
         if (intr_tx) {
                 intr_tx->callback = NULL;
                 intr_tx->callback_param = NULL;
-                tx->parent = intr_tx;
-                /* safe to set ->next outside the lock since we know we are
+                /* safe to chain outside the lock since we know we are
                  * not submitted yet
                  */
-                intr_tx->next = tx;
+                txd_chain(intr_tx, tx);
 
                 /* check if we need to append */
-                spin_lock_bh(&depend_tx->lock);
-                if (depend_tx->parent) {
-                        intr_tx->parent = depend_tx;
-                        depend_tx->next = intr_tx;
+                txd_lock(depend_tx);
+                if (txd_parent(depend_tx)) {
+                        txd_chain(depend_tx, intr_tx);
                         async_tx_ack(intr_tx);
                         intr_tx = NULL;
                 }
-                spin_unlock_bh(&depend_tx->lock);
+                txd_unlock(depend_tx);
 
                 if (intr_tx) {
-                        intr_tx->parent = NULL;
+                        txd_clear_parent(intr_tx);
                         intr_tx->tx_submit(intr_tx);
                         async_tx_ack(intr_tx);
                 }
@@ -176,21 +169,20 @@ async_tx_submit(struct dma_chan *chan, struct dma_async_tx_descriptor *tx,
                  * 2/ dependencies are 1:1 i.e. two transactions can
                  * not depend on the same parent
                  */
-                BUG_ON(async_tx_test_ack(depend_tx) || depend_tx->next ||
-                       tx->parent);
+                BUG_ON(async_tx_test_ack(depend_tx) || txd_next(depend_tx) ||
+                       txd_parent(tx));
 
                 /* the lock prevents async_tx_run_dependencies from missing
                  * the setting of ->next when ->parent != NULL
                  */
-                spin_lock_bh(&depend_tx->lock);
-                if (depend_tx->parent) {
+                txd_lock(depend_tx);
+                if (txd_parent(depend_tx)) {
                         /* we have a parent so we can not submit directly
                          * if we are staying on the same channel: append
                          * else: channel switch
                          */
                         if (depend_tx->chan == chan) {
-                                tx->parent = depend_tx;
-                                depend_tx->next = tx;
+                                txd_chain(depend_tx, tx);
                                 s = ASYNC_TX_SUBMITTED;
                         } else
                                 s = ASYNC_TX_CHANNEL_SWITCH;
@@ -203,7 +195,7 @@ async_tx_submit(struct dma_chan *chan, struct dma_async_tx_descriptor *tx,
                         else
                                 s = ASYNC_TX_CHANNEL_SWITCH;
                 }
-                spin_unlock_bh(&depend_tx->lock);
+                txd_unlock(depend_tx);
 
                 switch (s) {
                 case ASYNC_TX_SUBMITTED:
@@ -212,12 +204,12 @@ async_tx_submit(struct dma_chan *chan, struct dma_async_tx_descriptor *tx,
                         async_tx_channel_switch(depend_tx, tx);
                         break;
                 case ASYNC_TX_DIRECT_SUBMIT:
-                        tx->parent = NULL;
+                        txd_clear_parent(tx);
                         tx->tx_submit(tx);
                         break;
                 }
         } else {
-                tx->parent = NULL;
+                txd_clear_parent(tx);
                 tx->tx_submit(tx);
         }
 
diff --git a/crypto/async_tx/raid6test.c b/crypto/async_tx/raid6test.c
index f84f6b4301d9..c1321935ebcc 100644
--- a/crypto/async_tx/raid6test.c
+++ b/crypto/async_tx/raid6test.c
@@ -20,6 +20,7 @@
  *
  */
 #include <linux/async_tx.h>
+#include <linux/gfp.h>
 #include <linux/random.h>
 
 #undef pr
diff --git a/crypto/hmac.c b/crypto/hmac.c
index 15c2eb534541..8d9544cf8169 100644
--- a/crypto/hmac.c
+++ b/crypto/hmac.c
@@ -23,7 +23,6 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/scatterlist.h>
-#include <linux/slab.h>
 #include <linux/string.h>
 
 struct hmac_ctx {
diff --git a/crypto/rng.c b/crypto/rng.c
index ba05e7380e76..f93cb5311182 100644
--- a/crypto/rng.c
+++ b/crypto/rng.c
@@ -19,6 +19,7 @@
 #include <linux/mutex.h>
 #include <linux/random.h>
 #include <linux/seq_file.h>
+#include <linux/slab.h>
 #include <linux/string.h>
 
 static DEFINE_MUTEX(crypto_default_rng_lock);
diff --git a/crypto/seqiv.c b/crypto/seqiv.c
index 5a013a8bf87a..4c4491229417 100644
--- a/crypto/seqiv.c
+++ b/crypto/seqiv.c
@@ -20,6 +20,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/string.h>
 
diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c
index aa3f84ccc786..a35159947a26 100644
--- a/crypto/tcrypt.c
+++ b/crypto/tcrypt.c
@@ -18,8 +18,8 @@
 #include <crypto/hash.h>
 #include <linux/err.h>
 #include <linux/init.h>
+#include <linux/gfp.h>
 #include <linux/module.h>
-#include <linux/slab.h>
 #include <linux/scatterlist.h>
 #include <linux/string.h>
 #include <linux/moduleparam.h>
diff --git a/crypto/xor.c b/crypto/xor.c
index fc5b836f3430..b75182d8ab14 100644
--- a/crypto/xor.c
+++ b/crypto/xor.c
@@ -18,6 +18,7 @@
 
 #define BH_TRACE 0
 #include <linux/module.h>
+#include <linux/gfp.h>
 #include <linux/raid/xor.h>
 #include <linux/jiffies.h>
 #include <asm/xor.h>