Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[mv-sheeva.git] / drivers / crypto / hifn_795x.c

diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c
index fe765f49de589a1229205447e476678da5d0ff6b..c9c4befb5a8d261701698c570c668d5009113a64 100644 (file)
--- a/drivers/crypto/hifn_795x.c
+++ b/drivers/crypto/hifn_795x.c
@@ -1731,9 +1731,9 @@ static int ablkcipher_get(void *saddr, unsigned int *srestp, unsigned int offset
        while (size) {
                copy = min3(srest, dst->length, size);
 
-               daddr = kmap_atomic(sg_page(dst), KM_IRQ0);
+               daddr = kmap_atomic(sg_page(dst));
                memcpy(daddr + dst->offset + offset, saddr, copy);
-               kunmap_atomic(daddr, KM_IRQ0);
+               kunmap_atomic(daddr);
 
                nbytes -= copy;
                size -= copy;
@@ -1793,17 +1793,17 @@ static void hifn_process_ready(struct ablkcipher_request *req, int error)
                                continue;
                        }
 
-                       saddr = kmap_atomic(sg_page(t), KM_SOFTIRQ0);
+                       saddr = kmap_atomic(sg_page(t));
 
                        err = ablkcipher_get(saddr, &t->length, t->offset,
                                        dst, nbytes, &nbytes);
                        if (err < 0) {
-                               kunmap_atomic(saddr, KM_SOFTIRQ0);
+                               kunmap_atomic(saddr);
                                break;
                        }
 
                        idx += err;
-                       kunmap_atomic(saddr, KM_SOFTIRQ0);
+                       kunmap_atomic(saddr);
                }
 
                hifn_cipher_walk_exit(&rctx->walk);
@@ -2494,7 +2494,8 @@ static int hifn_alg_alloc(struct hifn_device *dev, struct hifn_alg_template *t)
                 t->drv_name, dev->name);
 
        alg->alg.cra_priority = 300;
-       alg->alg.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC;
+       alg->alg.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER |
+                               CRYPTO_ALG_KERN_DRIVER_ONLY | CRYPTO_ALG_ASYNC;
        alg->alg.cra_blocksize = t->bsize;
        alg->alg.cra_ctxsize = sizeof(struct hifn_context);
        alg->alg.cra_alignmask = 0;