History

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

Linus Torvalds committed 2 years ago

Commit b345fd52 parents 5b7ad87 b85e2da1 file · +1 −1Browse files

Unified · Split

tools/power/pm-graph/sleepgraph.py+1−1
@@ -4151,7 +4151,7 @@ def parseKernelLog(data): · 4150 unmodified lines
41514151 elif(re.match('Enabling non-boot CPUs .*', msg)):
41524152 # start of first cpu resume
41534153 cpu_start = ktime
4154− elif(re.match('smpboot: CPU (?P<cpu>[0-9]*) is now offline', msg)) \
4154+ elif(re.match('smpboot: CPU (?P<cpu>[0-9]*) is now offline', msg) \
41554155 or re.match('psci: CPU(?P<cpu>[0-9]*) killed.*', msg)):
41564156 # end of a cpu suspend, start of the next
41574157 m = re.match('smpboot: CPU (?P<cpu>[0-9]*) is now offline', msg)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t