From: Herbert Xu Date: Tue, 8 Jan 2008 06:16:44 +0000 (+1100) Subject: [CRYPTO] api: Set default CRYPTO_MINALIGN to unsigned long long X-Git-Tag: v2.6.25-rc1~1242^2~3 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6eb7228421c01ba48a6a88a7a5b3e71cfb70d4a9;p=linux-2.6-omap-h63xx.git [CRYPTO] api: Set default CRYPTO_MINALIGN to unsigned long long Thanks to David Miller for pointing out that the SLAB (or SLOB/SLUB) cache uses the alignment of unsigned long long if the architecture kmalloc/slab alignment macros are not defined. This patch changes the CRYPTO_MINALIGN so that it uses the same default value. Signed-off-by: Herbert Xu --- diff --git a/include/linux/crypto.h b/include/linux/crypto.h index 0aba1046020..5e02d1b4637 100644 --- a/include/linux/crypto.h +++ b/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;