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

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

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
parents e7c124bd 4eb1782e

scripts/recordmcount.pl

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