powerpc/64s: accumulate_stolen_time remove irq mask workaround
Nicholas Piggin
reviewerPATCH 1/1 powerpc/64s: accumulate_stolen_time remove irq mask workaround
The caller has been moved to C after irq soft-mask state has been reconciled, and Linux irqs have been marked as disabled, so this does not have to play games with irq internals.
Signed-off-by Nicholas Piggin <[email protected]>
--- arch/powerpc/kernel/time.c | 11 ----------- 1 file changed, 11 deletions(-)
arch/powerpc/kernel/time.c +0 -11
@@ -231,24 +231,13 @@ static u64 scan_dispatch_log(u64 stop_tb) void notrace accumulate_stolen_time(void) {u64 sst, ust; -unsigned long save_irq_soft_mask =irq_soft_mask_return ();struct cpu_accounting_data *acct = &local_paca->accounting; -/* We are called early in the exception entry, before -* soft/hard_enabled are sync'ed to the expected state -* for the exception. We are hard disabled but the PACA -* needs to reflect that so various debug stuff doesn't -* complain -*/ -irq_soft_mask_set (IRQS_DISABLED ); - sst =scan_dispatch_log (acct->starttime_user); ust =scan_dispatch_log (acct->starttime); acct->stime -= sst; acct->utime -= ust; acct->steal_time += ust + sst; - -irq_soft_mask_set (save_irq_soft_mask); }static inline u64 calculate_stolen_time (u64 stop_tb)
Signature · 1 line
2.23.0
Michael Ellerman
AppliedQuoted 3 lines · Nicholas Piggin
The caller has been moved to C after irq soft-mask state has been reconciled, and Linux irqs have been marked as disabled, so this does not have to play games with irq internals.
Applied to powerpc/next.
[1/1] powerpc/64s: accumulate_stolen_time remove irq mask workaround
https://git.kernel.org/powerpc/c/0cdff98b395e5ab71b650c3df154217b1348e9b5
cheers