diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2023-11-24 11:26:00 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2023-11-24 11:26:00 -0800 |
| commit | b345fd55a2b79d6aa92042b19be802425fc353cb (patch) | |
| tree | 40c3de90ba63115872bbfd391f15bd98d8873894 | |
| parent | Merge tag 'afs-fixes-20231124' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | PM: tools: Fix sleepgraph syntax error (diff) | |
| download | linux-b345fd55a2b79d6aa92042b19be802425fc353cb.tar.gz linux-b345fd55a2b79d6aa92042b19be802425fc353cb.tar.bz2 linux-b345fd55a2b79d6aa92042b19be802425fc353cb.zip | |
Merge tag 'pm-6.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management fix from Rafael Wysocki:
"Fix a syntax error in the sleepgraph utility which causes it to exit
early on every invocation (David Woodhouse)"
* tag 'pm-6.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
PM: tools: Fix sleepgraph syntax error
| -rwxr-xr-x | tools/power/pm-graph/sleepgraph.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/power/pm-graph/sleepgraph.py b/tools/power/pm-graph/sleepgraph.py index 4a356a706785..40ad221e8881 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) |