The following commit has been merged into the sched/core branch of tip: Commit-ID: 00717eb8c9557b5fcdd338db6faef532f6991d63 Gitweb: https://git.kernel.org/tip/00717eb8c9557b5fcdd338db6faef532f6991d63 Author: Peter Zijlstra <peterz@xxxxxxxxxxxxx> AuthorDate: Thu, 12 Jan 2023 20:43:30 +01:00 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitterDate: Fri, 13 Jan 2023 11:48:15 +01:00 cpuidle: Annotate poll_idle() The __cpuidle functions will become a noinstr class, as such they need explicit annotations. Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx> Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> Tested-by: Tony Lindgren <tony@xxxxxxxxxxx> Tested-by: Ulf Hansson <ulf.hansson@xxxxxxxxxx> Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx> Acked-by: Frederic Weisbecker <frederic@xxxxxxxxxx> Link: https://lore.kernel.org/r/20230112195540.312601331@xxxxxxxxxxxxx --- drivers/cpuidle/poll_state.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/cpuidle/poll_state.c b/drivers/cpuidle/poll_state.c index 1f578ed..d25ec52 100644 --- a/drivers/cpuidle/poll_state.c +++ b/drivers/cpuidle/poll_state.c @@ -13,7 +13,10 @@ static int __cpuidle poll_idle(struct cpuidle_device *dev, struct cpuidle_driver *drv, int index) { - u64 time_start = local_clock(); + u64 time_start; + + instrumentation_begin(); + time_start = local_clock(); dev->poll_time_limit = false; @@ -39,6 +42,7 @@ static int __cpuidle poll_idle(struct cpuidle_device *dev, raw_local_irq_disable(); current_clr_polling(); + instrumentation_end(); return index; }