Commit b345fd55 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 5b7ad877 b85e2dab

tools/power/pm-graph/sleepgraph.py

+1 −1
Original line number Diff line number Diff line
@@ -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)