cpuidle, intel_idle: Fix CPUIDLE_FLAG_IRQ_ENABLE *again*
[ Upstream commit6d9c7f51b1
] So objtool found this bug: vmlinux.o: warning: objtool: intel_idle_irq+0x10c: call to trace_hardirqs_off() leaves .noinstr.text section As per commit32d4fd5751
("cpuidle,intel_idle: Fix CPUIDLE_FLAG_IRQ_ENABLE"): "must not have tracing in idle functions" Clearly people can't read and tinker along until splat dissapears. This straight up reverts commitd295ad34f2
("intel_idle: Fix false positive RCU splats due to incorrect hardirqs state"). It doesn't re-introduce the problem because preceding patches fixed it properly. Fixes:d295ad34f2
("intel_idle: Fix false positive RCU splats due to incorrect hardirqs state") Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Signed-off-by: Ingo Molnar <mingo@kernel.org> Tested-by: Tony Lindgren <tony@atomide.com> Tested-by: Ulf Hansson <ulf.hansson@linaro.org> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Acked-by: Frederic Weisbecker <frederic@kernel.org> Link: https://lore.kernel.org/r/20230112195540.434302128@infradead.org Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
ad1370df2f
commit
dca64f4bea
|
@ -168,13 +168,7 @@ static __cpuidle int intel_idle_irq(struct cpuidle_device *dev,
|
||||||
|
|
||||||
raw_local_irq_enable();
|
raw_local_irq_enable();
|
||||||
ret = __intel_idle(dev, drv, index);
|
ret = __intel_idle(dev, drv, index);
|
||||||
|
raw_local_irq_disable();
|
||||||
/*
|
|
||||||
* The lockdep hardirqs state may be changed to 'on' with timer
|
|
||||||
* tick interrupt followed by __do_softirq(). Use local_irq_disable()
|
|
||||||
* to keep the hardirqs state correct.
|
|
||||||
*/
|
|
||||||
local_irq_disable();
|
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue