]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
fix kABI breakage from "crypto: hash - Add crypto_ahash_has_setkey"
authorDan Duval <dan.duval@oracle.com>
Wed, 18 May 2016 14:00:28 +0000 (10:00 -0400)
committerChuck Anderson <chuck.anderson@oracle.com>
Thu, 26 May 2016 22:44:21 +0000 (15:44 -0700)
Orabug: 23330916

Orabug: 23330916

Commit c1af244e143b4010401d70ba504c927196c75077 ("crypto: hash - Add
crypto_ahash_has_setkey") added an element "bool has_setkey" to the
crypto_ahash structure.  This element was added in a place where
there had been a "hole" in the structure, so the change affected
neither the offsets of the other elements nor the overall size of
the structure.

This commit wraps the new element in "#ifndef __GENKSYMS__" to hide
it from the kABI checker.

Signed-off-by: Dan Duval <dan.duval@oracle.com>
(cherry picked from commit da07fada818b94d1187241bcc1a7ed270a09a4f9)

Signed-off-by: Dan Duval <dan.duval@oracle.com>
include/crypto/hash.h

index bbc59bdd6395f9499c048aa8ce5b971f5b2b54fe..69e64e6db0c08ca2753f6114e830a9e413ef77e4 100644 (file)
@@ -199,7 +199,9 @@ struct crypto_ahash {
                      unsigned int keylen);
 
        unsigned int reqsize;
+#ifndef __GENKSYMS__
        bool has_setkey;
+#endif
        struct crypto_tfm base;
 };