Re: [PATCH 6.1 81/81] x86/process: Move the buffer clearing before MONITOR

On Tue, Jul 08, 2025 at 05:35:04PM +0100, Andrew Cooper wrote:

On 08/07/2025 5:24 pm, Greg Kroah-Hartman wrote:

...

@@ -895,13 +900,17 @@ static __cpuidle void mwait_idle(void) } __monitor((void *)&current_thread_info()->flags, 0, 0);

• if (!need_resched())
  

• 	__sti_mwait(0, 0);
  

• else
  

• if (need_resched()) {
  raw_local_irq_enable();
  

• 	goto out;
  

• }
  

• __sti_mwait(0, 0);
  

Erm, this doesn't look correct.

Did I get this merge wrong? I didn't get a conflict here, but I did in 6.15.y

The raw_local_irq_enable() needs to remain after __sti_mwait().

Is this correct in Linus's tree?

thanks,

greg k-h