[PATCH 5.4 024/191] powerpc/pseries: Mark accumulate_stolen_time() as notrace

From: Greg Kroah-Hartman
Date: Thu Jan 02 2020 - 17:12:02 EST

From: Michael Ellerman <mpe@xxxxxxxxxxxxxx>

[ Upstream commit eb8e20f89093b64f48975c74ccb114e6775cee22 ]

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 <mpe@xxxxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20191024055932.27940-1-mpe@xxxxxxxxxxxxxx
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
arch/powerpc/kernel/time.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

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();