]> git.itanic.dy.fi Git - linux-stable/commitdiff
crypto: caam/qi - fix compilation with CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
authorHoria Geantă <horia.geanta@nxp.com>
Mon, 10 Jul 2017 05:40:29 +0000 (08:40 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 9 Sep 2017 15:39:22 +0000 (17:39 +0200)
commit 1ed289f7b78c34565a33dbe6f8c482e71f493934 upstream.

caam/qi driver fails to compile when CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y.
Fix it by making the offending local per_cpu variable global.

Fixes: 67c2315def06c ("crypto: caam - add Queue Interface (QI) backend support")
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/crypto/caam/qi.c

index 1990ed460c46386def470dbf46b48fa5f42fe5c4..53aed58164164265e4e571a4fbb95d640db6a9d4 100644 (file)
@@ -55,6 +55,7 @@ struct caam_qi_pcpu_priv {
 } ____cacheline_aligned;
 
 static DEFINE_PER_CPU(struct caam_qi_pcpu_priv, pcpu_qipriv);
+static DEFINE_PER_CPU(int, last_cpu);
 
 /*
  * caam_qi_priv - CAAM QI backend private params
@@ -392,7 +393,6 @@ struct caam_drv_ctx *caam_drv_ctx_init(struct device *qidev,
        dma_addr_t hwdesc;
        struct caam_drv_ctx *drv_ctx;
        const cpumask_t *cpus = qman_affine_cpus();
-       static DEFINE_PER_CPU(int, last_cpu);
 
        num_words = desc_len(sh_desc);
        if (num_words > MAX_SDLEN) {