From ff136b32b2c85c270967007570f7a6a64e842c0c Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Thu, 23 Aug 2007 16:23:01 +0800
Subject: [PATCH] --- yaml --- r: 67020 b: refs/heads/master c:
 791b4d5f73cbc16ee532ebac5bd82d51524d4f99 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/crypto/ablkcipher.c | 5 ++++-
 trunk/crypto/blkcipher.c  | 6 +++---
 trunk/crypto/cipher.c     | 5 +++--
 trunk/crypto/hash.c       | 3 ++-
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index f5aa45868e56..a7200a1bbf90 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 39e1ee011f42dbbcb0210c73ea728ae54cf63b06
+refs/heads/master: 791b4d5f73cbc16ee532ebac5bd82d51524d4f99
diff --git a/trunk/crypto/ablkcipher.c b/trunk/crypto/ablkcipher.c
index 3dbb1cc6eab5..47438b650c92 100644
--- a/trunk/crypto/ablkcipher.c
+++ b/trunk/crypto/ablkcipher.c
@@ -16,10 +16,13 @@
 #include <crypto/algapi.h>
 #include <linux/errno.h>
 #include <linux/init.h>
+#include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/slab.h>
 #include <linux/seq_file.h>
 
-static int setkey_unaligned(struct crypto_ablkcipher *tfm, const u8 *key, unsigned int keylen)
+static int setkey_unaligned(struct crypto_ablkcipher *tfm, const u8 *key,
+			    unsigned int keylen)
 {
 	struct ablkcipher_alg *cipher = crypto_ablkcipher_alg(tfm);
 	unsigned long alignmask = crypto_ablkcipher_alignmask(tfm);
diff --git a/trunk/crypto/blkcipher.c b/trunk/crypto/blkcipher.c
index d8f8ec320213..5991c53eabac 100644
--- a/trunk/crypto/blkcipher.c
+++ b/trunk/crypto/blkcipher.c
@@ -339,7 +339,8 @@ static int blkcipher_walk_first(struct blkcipher_desc *desc,
 	return blkcipher_walk_next(desc, walk);
 }
 
-static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen)
+static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key,
+			    unsigned int keylen)
 {
 	struct blkcipher_alg *cipher = &tfm->__crt_alg->cra_blkcipher;
 	unsigned long alignmask = crypto_tfm_alg_alignmask(tfm);
@@ -360,8 +361,7 @@ static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key, unsigned int
 	return ret;
 }
 
-static int setkey(struct crypto_tfm *tfm, const u8 *key,
-		  unsigned int keylen)
+static int setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen)
 {
 	struct blkcipher_alg *cipher = &tfm->__crt_alg->cra_blkcipher;
 	unsigned long alignmask = crypto_tfm_alg_alignmask(tfm);
diff --git a/trunk/crypto/cipher.c b/trunk/crypto/cipher.c
index fc6b46f2a9b0..9a1a7316eeac 100644
--- a/trunk/crypto/cipher.c
+++ b/trunk/crypto/cipher.c
@@ -16,11 +16,12 @@
 #include <linux/kernel.h>
 #include <linux/crypto.h>
 #include <linux/errno.h>
-#include <linux/scatterlist.h>
+#include <linux/slab.h>
 #include <linux/string.h>
 #include "internal.h"
 
-static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen)
+static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key,
+			    unsigned int keylen)
 {
 	struct cipher_alg *cia = &tfm->__crt_alg->cra_cipher;
 	unsigned long alignmask = crypto_tfm_alg_alignmask(tfm);
diff --git a/trunk/crypto/hash.c b/trunk/crypto/hash.c
index 4fd470bd729b..7dcff671c19b 100644
--- a/trunk/crypto/hash.c
+++ b/trunk/crypto/hash.c
@@ -12,6 +12,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/slab.h>
 #include <linux/seq_file.h>
 
 #include "internal.h"
@@ -46,7 +47,7 @@ static int hash_setkey_unaligned(struct crypto_hash *crt, const u8 *key,
 }
 
 static int hash_setkey(struct crypto_hash *crt, const u8 *key,
-		unsigned int keylen)
+		       unsigned int keylen)
 {
 	struct crypto_tfm *tfm = crypto_hash_tfm(crt);
 	struct hash_alg *alg = &tfm->__crt_alg->cra_hash;