diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-04-23 13:22:06 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-04-23 13:22:06 +1000 |
| commit | 1ba58f640919afda241bc0451041b3408ea55e07 (patch) | |
| tree | 9df099b69c14d950a765bc63943c3ecb9b16c5ce /crypto/shash.c | |
| parent | c52cacae28a74e942b940fb7912bd4292b0276e0 (diff) | |
| parent | 752ac52c381b17d324399f2b32b2b69a0cda4ce4 (diff) | |
Merge remote-tracking branch 'llvmlinux/for-next'
Diffstat (limited to 'crypto/shash.c')
| -rw-r--r-- | crypto/shash.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/shash.c b/crypto/shash.c index 929058a68561..47c713954bf3 100644 --- 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, |