x86/mctelem: address violations of MISRA C: 2012 Rule 5.3

This addresses violations of MISRA C:2012 Rule 5.3 which states as
following: An identifier declared in an inner scope shall not hide an
identifier declared in an outer scope.

In this case the variable being shadowed is the file scope struct mctctl
in this file, therefore the local variables are renamed to avoid this.

No functional change.

Signed-off-by: Alessandro Zucchelli <alessandro.zucchelli@bugseng.com>
Signed-off-by: Nicola Vetrini <nicola.vetrini@bugseng.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
Acked-by: Jan Beulich <jbeulich@suse.com>

diff --git a/xen/arch/x86/cpu/mcheck/mctelem.c b/xen/arch/x86/cpu/mcheck/mctelem.c
index b8d0368a7d3794e169c1ecf819f21a6c185dc0e4..123e4102adcacc5e71da7a9aa2a2ae78904e75bf 100644 (file)
--- a/xen/arch/x86/cpu/mcheck/mctelem.c
+++ b/xen/arch/x86/cpu/mcheck/mctelem.c
@@ -168,28 +168,28 @@ static void mctelem_xchg_head(struct mctelem_ent **headp,
 void mctelem_defer(mctelem_cookie_t cookie, bool lmce)
 {
        struct mctelem_ent *tep = COOKIE2MCTE(cookie);
-       struct mc_telem_cpu_ctl *mctctl = &this_cpu(mctctl);
+       struct mc_telem_cpu_ctl *ctl = &this_cpu(mctctl);
 
-       ASSERT(mctctl->pending == NULL || mctctl->lmce_pending == NULL);
+       ASSERT(ctl->pending == NULL || ctl->lmce_pending == NULL);
 
-       if (mctctl->pending)
-               mctelem_xchg_head(&mctctl->pending, &tep->mcte_next, tep);
+       if (ctl->pending)
+               mctelem_xchg_head(&ctl->pending, &tep->mcte_next, tep);
        else if (lmce)
-               mctelem_xchg_head(&mctctl->lmce_pending, &tep->mcte_next, tep);
+               mctelem_xchg_head(&ctl->lmce_pending, &tep->mcte_next, tep);
        else {
                /*
                 * LMCE is supported on Skylake-server and later CPUs, on
                 * which mce_broadcast is always true. Therefore, non-empty
-                * mctctl->lmce_pending in this branch implies a broadcasting
+                * ctl->lmce_pending in this branch implies a broadcasting
                 * MC# is being handled, every CPU is in the exception
-                * context, and no one is consuming mctctl->pending at this
+                * context, and no one is consuming ctl->pending at this
                 * moment. As a result, the following two exchanges together
                 * can be treated as atomic.
                 */
-               if (mctctl->lmce_pending)
-                       mctelem_xchg_head(&mctctl->lmce_pending,
-                                         &mctctl->pending, NULL);
-               mctelem_xchg_head(&mctctl->pending, &tep->mcte_next, tep);
+               if (ctl->lmce_pending)
+                       mctelem_xchg_head(&ctl->lmce_pending,
+                                         &ctl->pending, NULL);
+               mctelem_xchg_head(&ctl->pending, &tep->mcte_next, tep);
        }
 }
 
@@ -213,7 +213,7 @@ void mctelem_process_deferred(unsigned int cpu,
 {
        struct mctelem_ent *tep;
        struct mctelem_ent *head, *prev;
-       struct mc_telem_cpu_ctl *mctctl = &per_cpu(mctctl, cpu);
+       struct mc_telem_cpu_ctl *ctl = &per_cpu(mctctl, cpu);
        int ret;
 
        /*
@@ -232,7 +232,7 @@ void mctelem_process_deferred(unsigned int cpu,
         * Any MC# occurring after the following atomic exchange will be
         * handled by another round of MCE softirq.
         */
-       mctelem_xchg_head(lmce ? &mctctl->lmce_pending : &mctctl->pending,
+       mctelem_xchg_head(lmce ? &ctl->lmce_pending : &ctl->pending,
                          &this_cpu(mctctl.processing), NULL);
 
        head = this_cpu(mctctl.processing);