Merge branch 'msm-fixes-3.19' of git://people.freedesktop.org/~robclark/linux into...

[cascardo/linux.git] / crypto / shash.c

diff --git a/crypto/shash.c b/crypto/shash.c
index 929058a..47c7139 100644 (file)
--- a/crypto/shash.c
+++ b/crypto/shash.c
@@ -67,7 +67,8 @@ EXPORT_SYMBOL_GPL(crypto_shash_setkey);
 static inline unsigned int shash_align_buffer_size(unsigned len,
                                                   unsigned long mask)
 {
-       return len + (mask & ~(__alignof__(u8 __attribute__ ((aligned))) - 1));
+       typedef u8 __attribute__ ((aligned)) u8_aligned;
+       return len + (mask & ~(__alignof__(u8_aligned) - 1));
 }
 
 static int shash_update_unaligned(struct shash_desc *desc, const u8 *data,