diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-08 12:27:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-08 12:27:44 -0700 |
| commit | b20dcab9d4589ef9918a13c888c5493945adfc13 (patch) | |
| tree | d18333ef4db91e274ebcf989cc8cdc4ac5ab9392 /crypto | |
| parent | ed81e780a7dd5698a986f246fad6a1d8d0b6f9ce (diff) | |
| parent | e6b80757700a11315dd81b161f8d86099214c185 (diff) | |
Merge tag 'llvmlinux-for-v3.16' of git://git.linuxfoundation.org/llvmlinux/kernel
Pull LLVM patches from Behan Webster:
"Next set of patches to support compiling the kernel with clang.
They've been soaking in linux-next since the last merge window.
More still in the works for the next merge window..."
* tag 'llvmlinux-for-v3.16' of git://git.linuxfoundation.org/llvmlinux/kernel:
arm, unwind, LLVMLinux: Enable clang to be used for unwinding the stack
ARM: LLVMLinux: Change "extern inline" to "static inline" in glue-cache.h
all: LLVMLinux: Change DWARF flag to support gcc and clang
net: netfilter: LLVMLinux: vlais-netfilter
crypto: LLVMLinux: aligned-attribute.patch
Diffstat (limited to 'crypto')
| -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, |