Patched in Tegra support.

6 files changed, 4 insertions, 10 deletions

diff --git a/crypto/async_tx/async_memcpy.c b/crypto/async_tx/async_memcpy.c
index 361b5e8239b..518c22bd956 100644
--- a/crypto/async_tx/async_memcpy.c
+++ b/crypto/async_tx/async_memcpy.c
@@ -25,7 +25,6 @@
  */
 #include <linux/kernel.h>
 #include <linux/highmem.h>
-#include <linux/module.h>
 #include <linux/mm.h>
 #include <linux/dma-mapping.h>
 #include <linux/async_tx.h>
@@ -79,13 +78,13 @@ async_memcpy(struct page *dest, struct page *src, unsigned int dest_offset,
                 /* wait for any prerequisite operations */
                 async_tx_quiesce(&submit->depend_tx);
 
-                dest_buf = kmap_atomic(dest) + dest_offset;
-                src_buf = kmap_atomic(src) + src_offset;
+                dest_buf = kmap_atomic(dest, KM_USER0) + dest_offset;
+                src_buf = kmap_atomic(src, KM_USER1) + src_offset;
 
                 memcpy(dest_buf, src_buf, len);
 
-                kunmap_atomic(src_buf);
-                kunmap_atomic(dest_buf);
+                kunmap_atomic(src_buf, KM_USER1);
+                kunmap_atomic(dest_buf, KM_USER0);
 
                 async_tx_sync_epilog(submit);
         }
diff --git a/crypto/async_tx/async_pq.c b/crypto/async_tx/async_pq.c
index 91d5d385899..fdd8257d35d 100644
--- a/crypto/async_tx/async_pq.c
+++ b/crypto/async_tx/async_pq.c
@@ -21,7 +21,6 @@
  */
 #include <linux/kernel.h>
 #include <linux/interrupt.h>
-#include <linux/module.h>
 #include <linux/dma-mapping.h>
 #include <linux/raid/pq.h>
 #include <linux/async_tx.h>
diff --git a/crypto/async_tx/async_raid6_recov.c b/crypto/async_tx/async_raid6_recov.c
index a9f08a6a582..ce038d861eb 100644
--- a/crypto/async_tx/async_raid6_recov.c
+++ b/crypto/async_tx/async_raid6_recov.c
@@ -22,7 +22,6 @@
  */
 #include <linux/kernel.h>
 #include <linux/interrupt.h>
-#include <linux/module.h>
 #include <linux/dma-mapping.h>
 #include <linux/raid/pq.h>
 #include <linux/async_tx.h>
diff --git a/crypto/async_tx/async_tx.c b/crypto/async_tx/async_tx.c
index 84212097937..7f2c00a4520 100644
--- a/crypto/async_tx/async_tx.c
+++ b/crypto/async_tx/async_tx.c
@@ -24,7 +24,6 @@
  *
  */
 #include <linux/rculist.h>
-#include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/async_tx.h>
 
diff --git a/crypto/async_tx/async_xor.c b/crypto/async_tx/async_xor.c
index 154cc84381c..bc28337fded 100644
--- a/crypto/async_tx/async_xor.c
+++ b/crypto/async_tx/async_xor.c
@@ -25,7 +25,6 @@
  */
 #include <linux/kernel.h>
 #include <linux/interrupt.h>
-#include <linux/module.h>
 #include <linux/mm.h>
 #include <linux/dma-mapping.h>
 #include <linux/raid/xor.h>
diff --git a/crypto/async_tx/raid6test.c b/crypto/async_tx/raid6test.c
index aa2b0270ed1..c88ff9e3fd3 100644
--- a/crypto/async_tx/raid6test.c
+++ b/crypto/async_tx/raid6test.c
@@ -23,7 +23,6 @@
 #include <linux/gfp.h>
 #include <linux/mm.h>
 #include <linux/random.h>
-#include <linux/module.h>
 
 #undef pr
 #define pr(fmt, args...) pr_info("raid6test: " fmt, ##args)