blob: 53c0811f61e1e7ae60104ca4cfb6fb0f9d5dcec0 [file] [log] [blame]
From 2085b10e09d0994f8681952d3c79bcdf5655f8bf Mon Sep 17 00:00:00 2001
From: Michael Ellerman <>
Date: Sun, 13 Oct 2019 21:23:51 +1100
Subject: [PATCH] powerpc/pseries: Mark accumulate_stolen_time() as notrace
commit eb8e20f89093b64f48975c74ccb114e6775cee22 upstream.
accumulate_stolen_time() is called prior to interrupt state being
reconciled, which can trip the warning in arch_local_irq_restore():
WARNING: CPU: 5 PID: 1017 at arch/powerpc/kernel/irq.c:258 .arch_local_irq_restore+0x9c/0x130
NIP .arch_local_irq_restore+0x9c/0x130
LR .rb_start_commit+0x38/0x80
Call Trace:
For now just mark it as notrace. We may change the ordering to call it
after interrupt state has been reconciled, but that is a larger
Signed-off-by: Michael Ellerman <>
Signed-off-by: Paul Gortmaker <>
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 619447b1b797..11301a1187f3 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -232,7 +232,7 @@ static u64 scan_dispatch_log(u64 stop_tb)
* Accumulate stolen time by scanning the dispatch trace log.
* Called on entry from user mode.
-void accumulate_stolen_time(void)
+void notrace accumulate_stolen_time(void)
u64 sst, ust;
unsigned long save_irq_soft_mask = irq_soft_mask_return();