x86/msr: Rename 'mce_wrmsrl()' to 'mce_wrmsrq()'

Suggested-by: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Juergen Gross <jgross@suse.com>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Xin Li <xin@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c
index 765b799c70907bb726e11c63cc83add2c6932b0b..255927f0284eee1b577fc41b22e815a500c6a68b 100644 (file)
--- a/arch/x86/kernel/cpu/mce/core.c
+++ b/arch/x86/kernel/cpu/mce/core.c
@@ -423,7 +423,7 @@ noinstr u64 mce_rdmsrq(u32 msr)
        return EAX_EDX_VAL(val, low, high);
 }
 
-static noinstr void mce_wrmsrl(u32 msr, u64 v)
+static noinstr void mce_wrmsrq(u32 msr, u64 v)
 {
        u32 low, high;
 
@@ -829,7 +829,7 @@ clear_it:
                /*
                 * Clear state for this bank.
                 */
-               mce_wrmsrl(mca_msr_reg(i, MCA_STATUS), 0);
+               mce_wrmsrq(mca_msr_reg(i, MCA_STATUS), 0);
        }
 
        /*
@@ -910,8 +910,8 @@ static noinstr bool quirk_skylake_repmov(void)
              MCI_STATUS_ADDRV | MCI_STATUS_MISCV |
              MCI_STATUS_AR | MCI_STATUS_S)) {
                misc_enable &= ~MSR_IA32_MISC_ENABLE_FAST_STRING;
-               mce_wrmsrl(MSR_IA32_MISC_ENABLE, misc_enable);
-               mce_wrmsrl(MSR_IA32_MCx_STATUS(1), 0);
+               mce_wrmsrq(MSR_IA32_MISC_ENABLE, misc_enable);
+               mce_wrmsrq(MSR_IA32_MCx_STATUS(1), 0);
 
                instrumentation_begin();
                pr_err_once("Erratum detected, disable fast string copy instructions.\n");
@@ -1274,7 +1274,7 @@ static __always_inline void mce_clear_state(unsigned long *toclear)
 
        for (i = 0; i < this_cpu_read(mce_num_banks); i++) {
                if (arch_test_bit(i, toclear))
-                       mce_wrmsrl(mca_msr_reg(i, MCA_STATUS), 0);
+                       mce_wrmsrq(mca_msr_reg(i, MCA_STATUS), 0);
        }
 }
 
@@ -1693,7 +1693,7 @@ out:
        instrumentation_end();
 
 clear:
-       mce_wrmsrl(MSR_IA32_MCG_STATUS, 0);
+       mce_wrmsrq(MSR_IA32_MCG_STATUS, 0);
 }
 EXPORT_SYMBOL_GPL(do_machine_check);