diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2008-01-08 17:16:44 +1100 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2008-01-11 08:17:01 +1100 |
commit | 6eb7228421c01ba48a6a88a7a5b3e71cfb70d4a9 (patch) | |
tree | 15ec08e0ede5ca43e348a30176cd7c96ffb7985d /include/linux/crypto.h | |
parent | 38ed9ab23b8614c9c1553b2961ef2627f3088fd9 (diff) | |
download | linux-stable-6eb7228421c01ba48a6a88a7a5b3e71cfb70d4a9.tar.gz linux-stable-6eb7228421c01ba48a6a88a7a5b3e71cfb70d4a9.tar.bz2 linux-stable-6eb7228421c01ba48a6a88a7a5b3e71cfb70d4a9.zip |
[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 <herbert@gondor.apana.org.au>
Diffstat (limited to 'include/linux/crypto.h')
-rw-r--r-- | include/linux/crypto.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/crypto.h b/include/linux/crypto.h index 0aba10460201..5e02d1b46370 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; |