Commit f91a3aa6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'locking-urgent-2020-11-29' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull locking fixes from Thomas Gleixner:
 "Two more places which invoke tracing from RCU disabled regions in the
  idle path.

  Similar to the entry path the low level idle functions have to be
  non-instrumentable"

* tag 'locking-urgent-2020-11-29' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  intel_idle: Fix intel_idle() vs tracing
  sched/idle: Fix arch_cpu_idle() vs tracing
parents 8b7a51ba 6e1d2bc6

arch/alpha/kernel/process.c

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ EXPORT_SYMBOL(pm_power_off); 
void arch_cpu_idle(void)

{

	wtint(0);

	local_irq_enable();

	raw_local_irq_enable();

}



void arch_cpu_idle_dead(void)

arch/arm/kernel/process.c

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ void arch_cpu_idle(void) 
		arm_pm_idle();

	else

		cpu_do_idle();

	local_irq_enable();

	raw_local_irq_enable();

}



void arch_cpu_idle_prepare(void)

arch/arm64/kernel/process.c

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ void arch_cpu_idle(void) 
	 * tricks

	 */

	cpu_do_idle();

	local_irq_enable();

	raw_local_irq_enable();

}



#ifdef CONFIG_HOTPLUG_CPU

arch/csky/kernel/process.c

+1 −1
Original line number Diff line number Diff line
@@ -102,6 +102,6 @@ void arch_cpu_idle(void) 
#ifdef CONFIG_CPU_PM_STOP

	asm volatile("stop\n");

#endif

	local_irq_enable();

	raw_local_irq_enable();

}

#endif

arch/h8300/kernel/process.c

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ asmlinkage void ret_from_kernel_thread(void); 
 */

void arch_cpu_idle(void)

{

	local_irq_enable();

	raw_local_irq_enable();

	__asm__("sleep");

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE