Merge tag 'llvmlinux-for-v3.18' of git://git.linuxfoundation.org/llvmlinux/kernel

Pull LLVM updates from Behan Webster:
 "These patches remove the use of VLAIS using a new SHASH_DESC_ON_STACK
  macro.

  Some of the previously accepted VLAIS removal patches haven't used
  this macro.  I will push new patches to consistently use this macro in
  all those older cases for 3.19"

[ More LLVM patches coming in through subsystem trees, and LLVM itself
  needs some fixes that are already in many distributions but not in
  released versions of LLVM.  Some day this will all "just work"  - Linus ]

* tag 'llvmlinux-for-v3.18' of git://git.linuxfoundation.org/llvmlinux/kernel:
  crypto: LLVMLinux: Remove VLAIS usage from crypto/testmgr.c
  security, crypto: LLVMLinux: Remove VLAIS from ima_crypto.c
  crypto: LLVMLinux: Remove VLAIS usage from libcrc32c.c
  crypto: LLVMLinux: Remove VLAIS usage from crypto/hmac.c
  crypto, dm: LLVMLinux: Remove VLAIS usage from dm-crypt
  crypto: LLVMLinux: Remove VLAIS from crypto/.../qat_algs.c
  crypto: LLVMLinux: Remove VLAIS from crypto/omap_sham.c
  crypto: LLVMLinux: Remove VLAIS from crypto/n2_core.c
  crypto: LLVMLinux: Remove VLAIS from crypto/mv_cesa.c
  crypto: LLVMLinux: Remove VLAIS from crypto/ccp/ccp-crypto-sha.c
  btrfs: LLVMLinux: Remove VLAIS
  crypto: LLVMLinux: Add macro to remove use of VLAIS in crypto code

1 files changed, 6 insertions, 7 deletions

diff --git a/drivers/crypto/ccp/ccp-crypto-sha.c b/drivers/crypto/ccp/ccp-crypto-sha.c
index 873f23425245..96531571f7cf 100644
--- a/drivers/crypto/ccp/ccp-crypto-sha.c
+++ b/drivers/crypto/ccp/ccp-crypto-sha.c
@@ -198,10 +198,9 @@ static int ccp_sha_setkey(struct crypto_ahash *tfm, const u8 *key,
 {
         struct ccp_ctx *ctx = crypto_tfm_ctx(crypto_ahash_tfm(tfm));
         struct crypto_shash *shash = ctx->u.sha.hmac_tfm;
-        struct {
-                struct shash_desc sdesc;
-                char ctx[crypto_shash_descsize(shash)];
-        } desc;
+
+        SHASH_DESC_ON_STACK(sdesc, shash);
+
         unsigned int block_size = crypto_shash_blocksize(shash);
         unsigned int digest_size = crypto_shash_digestsize(shash);
         int i, ret;
@@ -216,11 +215,11 @@ static int ccp_sha_setkey(struct crypto_ahash *tfm, const u8 *key,
 
         if (key_len > block_size) {
                 /* Must hash the input key */
-                desc.sdesc.tfm = shash;
-                desc.sdesc.flags = crypto_ahash_get_flags(tfm) &
+                sdesc->tfm = shash;
+                sdesc->flags = crypto_ahash_get_flags(tfm) &
                         CRYPTO_TFM_REQ_MAY_SLEEP;
 
-                ret = crypto_shash_digest(&desc.sdesc, key, key_len,
+                ret = crypto_shash_digest(sdesc, key, key_len,
                                           ctx->u.sha.key);
                 if (ret) {
                         crypto_ahash_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);