sched: remove the 'u64 now' parameter from ->put_prev_task()

[safe/jmp/linux-2.6] / include / linux / crypto.h

diff --git a/include/linux/crypto.h b/include/linux/crypto.h
index 0ec2467..357e8cf 100644 (file)
--- a/include/linux/crypto.h
+++ b/include/linux/crypto.h
@@ -295,28 +295,8 @@ struct blkcipher_tfm {
 };
 
 struct cipher_tfm {
-       void *cit_iv;
-       unsigned int cit_ivsize;
-       u32 cit_mode;
        int (*cit_setkey)(struct crypto_tfm *tfm,
                          const u8 *key, unsigned int keylen);
-       int (*cit_encrypt)(struct crypto_tfm *tfm,
-                          struct scatterlist *dst,
-                          struct scatterlist *src,
-                          unsigned int nbytes);
-       int (*cit_encrypt_iv)(struct crypto_tfm *tfm,
-                             struct scatterlist *dst,
-                             struct scatterlist *src,
-                             unsigned int nbytes, u8 *iv);
-       int (*cit_decrypt)(struct crypto_tfm *tfm,
-                          struct scatterlist *dst,
-                          struct scatterlist *src,
-                          unsigned int nbytes);
-       int (*cit_decrypt_iv)(struct crypto_tfm *tfm,
-                          struct scatterlist *dst,
-                          struct scatterlist *src,
-                          unsigned int nbytes, u8 *iv);
-       void (*cit_xor_block)(u8 *dst, const u8 *src);
        void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
        void (*cit_decrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
 };
@@ -588,6 +568,12 @@ static inline int crypto_ablkcipher_reqsize(struct crypto_ablkcipher *tfm)
        return crypto_ablkcipher_crt(tfm)->reqsize;
 }
 
+static inline void ablkcipher_request_set_tfm(
+       struct ablkcipher_request *req, struct crypto_ablkcipher *tfm)
+{
+       req->base.tfm = crypto_ablkcipher_tfm(tfm);
+}
+
 static inline struct ablkcipher_request *ablkcipher_request_cast(
        struct crypto_async_request *req)
 {
@@ -603,7 +589,7 @@ static inline struct ablkcipher_request *ablkcipher_request_alloc(
                      crypto_ablkcipher_reqsize(tfm), gfp);
 
        if (likely(req))
-               req->base.tfm = crypto_ablkcipher_tfm(tfm);
+               ablkcipher_request_set_tfm(req, tfm);
 
        return req;
 }