aboutsummaryrefslogtreecommitdiff
path: root/crypto/shash.c
diff options
context:
space:
mode:
authorMark Charlebois <charlebm@gmail.com>2012-11-20 21:18:16 +0100
committerBehan Webster <behanw@converseincode.com>2014-06-07 11:44:39 -0700
commit66d8ea57284141bbeed01ee3250e23e8553dbca8 (patch)
tree38f979619d22b01477328b90799acbccb211ee01 /crypto/shash.c
parentd4c54919ed86302094c0ca7d48a8cbd4ee753e92 (diff)
crypto: LLVMLinux: aligned-attribute.patch
__attribute__((aligned)) applies the default alignment for the largest scalar type for the target ABI. gcc allows it to be applied inline to a defined type. Clang only allows it to be applied to a type definition (PR11071). Making it into 2 lines makes it more readable and works with both compilers. Author: Mark Charlebois <charlebm@gmail.com> Signed-off-by: Mark Charlebois <charlebm@gmail.com> Signed-off-by: Behan Webster <behanw@converseincode.com>
Diffstat (limited to 'crypto/shash.c')
-rw-r--r--crypto/shash.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/shash.c b/crypto/shash.c
index 929058a6856..47c713954bf 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,