From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 15 Jun 2026 09:38:14 +0000 (+0530)
Subject: Merge tag 'x86-msr-2026-06-14' of gitolite.kernel.org:pub/scm/linux/kernel/git/tip/tip
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=7561361d7655828d50482cd9e80fa3bf73d9c92e;p=thirdparty%2Flinux.git

Merge tag 'x86-msr-2026-06-14' of gitolite.kernel.org:pub/scm/linux/kernel/git/tip/tip

Pull x86/msr updates from Ingo Molnar:

 - Large series to reorganize the rdmsr/wrmsr APIs to remove
   32-bit variants and convert to 64-bit variants (Juergen Gross)

 - Fix W=1 warning (HyeongJun An)

* tag 'x86-msr-2026-06-14' of gitolite.kernel.org:pub/scm/linux/kernel/git/tip/tip:
  x86/msr: Remove wrmsrl()
  x86/msr: Switch wrmsrl() users to wrmsrq()
  x86/msr: Remove rdmsrl()
  x86/msr: Switch rdmsrl() users to rdmsrq()
  x86/msr: Remove wrmsr_safe_on_cpu()
  x86/msr: Switch wrmsr_safe_on_cpu() users to wrmsrq_safe_on_cpu()
  x86/msr: Remove rdmsr_safe_on_cpu()
  x86/msr: Switch rdmsr_safe_on_cpu() users to rdmsrq_safe_on_cpu()
  x86/msr: Don't use rdmsr_safe_on_cpu() in rdmsrq_safe_on_cpu()
  x86/msr: Remove wrmsr_on_cpu()
  x86/msr: Switch wrmsr_on_cpu() users to wrmsrq_on_cpu()
  x86/msr: Remove rdmsr_on_cpu()
  x86/msr: Switch rdmsr_on_cpu() users to rdmsrq_on_cpu()
  x86/msr: Remove rdmsrl_on_cpu()
  x86/msr: Switch rdmsrl_on_cpu() user to rdmsrq_on_cpu()
  x86/process: Convert rdmsr() to rdmsrq() in arch_post_acpi_subsys_init() to address W=1 warning
---

7561361d7655828d50482cd9e80fa3bf73d9c92e
diff --cc arch/x86/events/intel/core.c
index 6f4e0e5a24163,e9baa64dc9625..c819b060603f0
--- a/arch/x86/events/intel/core.c
+++ b/arch/x86/events/intel/core.c
@@@ -3417,13 -3166,13 +3417,13 @@@ static void intel_pmu_config_acr(int id
  	}
  
  	if (cpuc->acr_cfg_b[idx] != mask) {
- 		wrmsrl(msr_b + msr_offset, mask);
+ 		wrmsrq(msr_b + msr_offset, mask);
  		cpuc->acr_cfg_b[idx] = mask;
  	}
 -	/* Only need to update the reload value when there is a valid config value. */
 -	if (mask && cpuc->acr_cfg_c[idx] != reload) {
 +	/* Only update CFG_C reload when ACR is actively enabled (mask != 0) */
 +	if (mask && ((cpuc->cfg_c_val[idx] & ARCH_PEBS_RELOAD) != reload)) {
- 		wrmsrl(msr_c + msr_offset, reload);
+ 		wrmsrq(msr_c + msr_offset, reload);
 -		cpuc->acr_cfg_c[idx] = reload;
 +		cpuc->cfg_c_val[idx] = reload;
  	}
  }