Merge tag 's390-5.16-6' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

torvalds · torvalds · commit eec4df26e24e · 2021-12-29T10:07:20.000-08:00
Pull s390 fix from Heiko Carstens:

 - fix s390 mcount regex typo in recordmcount.pl

* tag 's390-5.16-6' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  recordmcount.pl: fix typo in s390 mcount regex
diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl
@@ -219,7 +219,7 @@
 
 } elsif ($arch eq "s390" && $bits == 64) {
     if ($cc =~ /-DCC_USING_HOTPATCH/) {
-	$mcount_regex = "^\\s*([0-9a-fA-F]+):\\s*c0 04 00 00 00 00\\s*(bcrl\\s*0,|jgnop\\s*)[0-9a-f]+ <([^\+]*)>\$";
+	$mcount_regex = "^\\s*([0-9a-fA-F]+):\\s*c0 04 00 00 00 00\\s*(brcl\\s*0,|jgnop\\s*)[0-9a-f]+ <([^\+]*)>\$";
 	$mcount_adjust = 0;
     }
     $alignment = 8;

Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,7 @@`
`219`	`219`
`220`	`220`	`} elsif ($arch eq "s390" && $bits == 64) {`
`221`	`221`	`if ($cc =~ /-DCC_USING_HOTPATCH/) {`
`222`		`- $mcount_regex = "^\\s([0-9a-fA-F]+):\\sc0 04 00 00 00 00\\s(bcrl\\s0,\|jgnop\\s)[0-9a-f]+ <([^\+])>\$";`
	`222`	`+ $mcount_regex = "^\\s([0-9a-fA-F]+):\\sc0 04 00 00 00 00\\s(brcl\\s0,\|jgnop\\s)[0-9a-f]+ <([^\+])>\$";`
`223`	`223`	`$mcount_adjust = 0;`
`224`	`224`	`}`
`225`	`225`	`$alignment = 8;`