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

eec4df26 · Linus Torvalds <[email protected]> · 2021-12-29 10:07:20 -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

Commit: eec4df26e24e978e49ccf9bcf49ca0f2ccdaeffe
Parents: e7c124bd · 4eb1782e

Merge commit. Changes below are compared with the first parent: e7c124bd.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
scripts/recordmcount.pl	modified	+1	−1	View file

scripts/recordmcount.pl

View file

diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl
index 52a000b..3ccb2c7 100755
--- a/scripts/recordmcount.pl
+++ b/scripts/recordmcount.pl
@@ -219,7 +219,7 @@ if ($arch eq "x86_64") {
 
 } 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;