| From b3ff9d3868868e4bf392a38acda8479ee55c0327 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 15 Nov 2023 11:47:51 -0500 |
| Subject: PM: tools: Fix sleepgraph syntax error |
| |
| From: David Woodhouse <dwmw@amazon.co.uk> |
| |
| [ Upstream commit b85e2dab33ce467e8dcf1cb6c0c587132ff17f56 ] |
| |
| The sleepgraph tool currently fails: |
| |
| File "/usr/bin/sleepgraph", line 4155 |
| or re.match('psci: CPU(?P<cpu>[0-9]*) killed.*', msg)): |
| ^ |
| SyntaxError: unmatched ')' |
| |
| Fixes: 34ea427e01ea ("PM: tools: sleepgraph: Recognize "CPU killed" messages") |
| Signed-off-by: David Woodhouse <dwmw@amazon.co.uk> |
| Reviewed-by: Wolfram Sang <wsa@kernel.org> |
| Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| tools/power/pm-graph/sleepgraph.py | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/tools/power/pm-graph/sleepgraph.py b/tools/power/pm-graph/sleepgraph.py |
| index 4a356a7067855..40ad221e88811 100755 |
| --- a/tools/power/pm-graph/sleepgraph.py |
| +++ b/tools/power/pm-graph/sleepgraph.py |
| @@ -4151,7 +4151,7 @@ def parseKernelLog(data): |
| elif(re.match('Enabling non-boot CPUs .*', msg)): |
| # start of first cpu resume |
| cpu_start = ktime |
| - elif(re.match('smpboot: CPU (?P<cpu>[0-9]*) is now offline', msg)) \ |
| + elif(re.match('smpboot: CPU (?P<cpu>[0-9]*) is now offline', msg) \ |
| or re.match('psci: CPU(?P<cpu>[0-9]*) killed.*', msg)): |
| # end of a cpu suspend, start of the next |
| m = re.match('smpboot: CPU (?P<cpu>[0-9]*) is now offline', msg) |
| -- |
| 2.42.0 |
| |
