Merge ../linux-2.6/

Conflicts:

	drivers/scsi/aacraid/comminit.c

Fixed up by removing the now renamed CONFIG_IOMMU option from
aacraid

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 13 insertions, 10 deletions

diff --git a/crypto/deflate.c b/crypto/deflate.c
index f209368d62ae..6588bbf82e9b 100644
--- a/crypto/deflate.c
+++ b/crypto/deflate.c
@@ -102,8 +102,9 @@ static void deflate_decomp_exit(struct deflate_ctx *ctx)
         kfree(ctx->decomp_stream.workspace);
 }
 
-static int deflate_init(void *ctx)
+static int deflate_init(struct crypto_tfm *tfm)
 {
+        struct deflate_ctx *ctx = crypto_tfm_ctx(tfm);
         int ret;
         
         ret = deflate_comp_init(ctx);
@@ -116,17 +117,19 @@ out:
         return ret;
 }
 
-static void deflate_exit(void *ctx)
+static void deflate_exit(struct crypto_tfm *tfm)
 {
+        struct deflate_ctx *ctx = crypto_tfm_ctx(tfm);
+
         deflate_comp_exit(ctx);
         deflate_decomp_exit(ctx);
 }
 
-static int deflate_compress(void *ctx, const u8 *src, unsigned int slen,
-                            u8 *dst, unsigned int *dlen)
+static int deflate_compress(struct crypto_tfm *tfm, const u8 *src,
+                            unsigned int slen, u8 *dst, unsigned int *dlen)
 {
         int ret = 0;
-        struct deflate_ctx *dctx = ctx;
+        struct deflate_ctx *dctx = crypto_tfm_ctx(tfm);
         struct z_stream_s *stream = &dctx->comp_stream;
 
         ret = zlib_deflateReset(stream);
@@ -151,12 +154,12 @@ out:
         return ret;
 }
  
-static int deflate_decompress(void *ctx, const u8 *src, unsigned int slen,
-                              u8 *dst, unsigned int *dlen)
+static int deflate_decompress(struct crypto_tfm *tfm, const u8 *src,
+                              unsigned int slen, u8 *dst, unsigned int *dlen)
 {
         
         int ret = 0;
-        struct deflate_ctx *dctx = ctx;
+        struct deflate_ctx *dctx = crypto_tfm_ctx(tfm);
         struct z_stream_s *stream = &dctx->decomp_stream;
 
         ret = zlib_inflateReset(stream);
@@ -198,9 +201,9 @@ static struct crypto_alg alg = {
         .cra_ctxsize            = sizeof(struct deflate_ctx),
         .cra_module             = THIS_MODULE,
         .cra_list               = LIST_HEAD_INIT(alg.cra_list),
+        .cra_init               = deflate_init,
+        .cra_exit               = deflate_exit,
         .cra_u                  = { .compress = {
-        .coa_init               = deflate_init,
-        .coa_exit               = deflate_exit,
         .coa_compress           = deflate_compress,
         .coa_decompress         = deflate_decompress } }
 };