Merge tag 'v3.12-rc3' into irq/core

[~andy/linux] / include / crypto / hash.h

diff --git a/include/crypto/hash.h b/include/crypto/hash.h
index 3e89ce16b59ca94c7e453ba490fd463152ce063b..26cb1eb16f4c0df0be234d081a419596fb081167 100644 (file)
--- a/include/crypto/hash.h
+++ b/include/crypto/hash.h
@@ -75,7 +75,8 @@ struct shash_alg {
        unsigned int descsize;
 
        /* These fields must match hash_alg_common. */
-       unsigned int digestsize;
+       unsigned int digestsize
+               __attribute__ ((aligned(__alignof__(struct hash_alg_common))));
        unsigned int statesize;
 
        struct crypto_alg base;