From e0148ae6bbfe987952f96d50c6847368c802a6a2 Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Tue, 8 Jan 2008 17:16:44 +1100
Subject: [PATCH] --- yaml --- r: 76007 b: refs/heads/master c:
 6eb7228421c01ba48a6a88a7a5b3e71cfb70d4a9 h: refs/heads/master i:   76005:
 f652f733a7e2a4a04753cfea41fd9359eb32b43e   76003:
 b1d61c2f84c55f4f04f1a67c283725f6b3ffa0df   75999:
 19844ecdd37b959b7ef76d1804515b6b615777ab v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/crypto.h | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 26afbe6ed76c..81ec1c334042 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38ed9ab23b8614c9c1553b2961ef2627f3088fd9
+refs/heads/master: 6eb7228421c01ba48a6a88a7a5b3e71cfb70d4a9
diff --git a/trunk/include/linux/crypto.h b/trunk/include/linux/crypto.h
index 0aba10460201..5e02d1b46370 100644
--- a/trunk/include/linux/crypto.h
+++ b/trunk/include/linux/crypto.h
@@ -90,13 +90,11 @@
 #define CRYPTO_MINALIGN ARCH_KMALLOC_MINALIGN
 #elif defined(ARCH_SLAB_MINALIGN)
 #define CRYPTO_MINALIGN ARCH_SLAB_MINALIGN
+#else
+#define CRYPTO_MINALIGN __alignof__(unsigned long long)
 #endif
 
-#ifdef CRYPTO_MINALIGN
 #define CRYPTO_MINALIGN_ATTR __attribute__ ((__aligned__(CRYPTO_MINALIGN)))
-#else
-#define CRYPTO_MINALIGN_ATTR
-#endif
 
 struct scatterlist;
 struct crypto_ablkcipher;