diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-19 14:59:07 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-19 14:59:07 -0700 |
| commit | fcbaa19cb691a882b52164d375243638a9f0c7d0 (patch) | |
| tree | d22e795511b00930b9784bd8ca2f6477f24652f8 /crypto/shash.c | |
| parent | 6e3b70d7efc613e9444d3931f89c8586880a9181 (diff) | |
| parent | 9b40a3dd3d4e3ff9904e049f6794c972b603272f (diff) | |
| download | linux-crypto-fcbaa19cb691a882b52164d375243638a9f0c7d0.tar.gz linux-crypto-fcbaa19cb691a882b52164d375243638a9f0c7d0.zip | |
Merge tag 'v3.16-rc5' into next/fixes-non-critical
Linux 3.16-rc5
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 929058a6..47c71395 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, |