From b29795ce21632c804a58332e6d4958ffe61c9d8d Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Wed, 19 May 2010 11:50:58 +1000
Subject: [PATCH] --- yaml --- r: 196729 b: refs/heads/master c:
 18eb8ea6ee4cc9ed39b45f95b734f523bcfb586b h: refs/heads/master i:   196727:
 dc50b25d28fb6e3e6d8c085e840b4501ce89e1a5 v: v3

---
 [refs]               | 2 +-
 trunk/crypto/shash.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index fa282cb07ba1..fb5cd61fb71d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5bdd5ded95b3188d58ba43ac801b8849cbea1b16
+refs/heads/master: 18eb8ea6ee4cc9ed39b45f95b734f523bcfb586b
diff --git a/trunk/crypto/shash.c b/trunk/crypto/shash.c
index 91f7b9d83881..22fd9433141f 100644
--- a/trunk/crypto/shash.c
+++ b/trunk/crypto/shash.c
@@ -37,7 +37,7 @@ static int shash_setkey_unaligned(struct crypto_shash *tfm, const u8 *key,
 	u8 *buffer, *alignbuffer;
 	int err;
 
-	absize = keylen + (alignmask & ~(CRYPTO_MINALIGN - 1));
+	absize = keylen + (alignmask & ~(crypto_tfm_ctx_alignment() - 1));
 	buffer = kmalloc(absize, GFP_KERNEL);
 	if (!buffer)
 		return -ENOMEM;