From: Dan Duval <dan.duval@oracle.com>
Date: Wed, 18 May 2016 14:00:28 +0000 (-0400)
Subject: fix kABI breakage from "crypto: hash - Add crypto_ahash_has_setkey"
X-Git-Tag: v4.1.12-92~150^2~285
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=974a45747e7c6e2b2012769ae7415f7801ed50c2;p=users%2Fjedix%2Flinux-maple.git

fix kABI breakage from "crypto: hash - Add crypto_ahash_has_setkey"

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>
---

diff --git a/include/crypto/hash.h b/include/crypto/hash.h
index bbc59bdd6395..69e64e6db0c0 100644
--- a/include/crypto/hash.h
+++ b/include/crypto/hash.h
@@ -199,7 +199,9 @@ struct crypto_ahash {
 		      unsigned int keylen);
 
 	unsigned int reqsize;
+#ifndef __GENKSYMS__
 	bool has_setkey;
+#endif
 	struct crypto_tfm base;
 };