diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-10-16 10:51:41 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-10-16 10:51:41 -0700 |
commit | 368a978cc52ad14f90bd04a7d94ec0070da3e1c1 (patch) | |
tree | 0aef50e73e143640f6dc233859cf6fce817fefd8 /scripts | |
parent | 6985c40ab6c5d63a494ce9adce9a4768364f2507 (diff) | |
parent | be358af1191b1b2fedebd8f3421cafdc8edacc7d (diff) | |
download | linux-stable-368a978cc52ad14f90bd04a7d94ec0070da3e1c1.tar.gz linux-stable-368a978cc52ad14f90bd04a7d94ec0070da3e1c1.tar.bz2 linux-stable-368a978cc52ad14f90bd04a7d94ec0070da3e1c1.zip |
Merge tag 'trace-v5.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Tracing fixes for 5.15:
- Fix defined but not use warning/error for osnoise function
- Fix memory leak in event probe
- Fix memblock leak in bootconfig
- Fix the API of event probes to be like kprobes
- Added test to check removal of event probe API
- Fix recordmcount.pl for nds32 failed build
* tag 'trace-v5.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
nds32/ftrace: Fix Error: invalid operands (*UND* and *UND* sections) for `^'
selftests/ftrace: Update test for more eprobe removal process
tracing: Fix event probe removal from dynamic events
tracing: Fix missing * in comment block
bootconfig: init: Fix memblock leak in xbc_make_cmdline()
tracing: Fix memory leak in eprobe_register()
tracing: Fix missing osnoise tracer on max_latency
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/recordmcount.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl index 8f6b13ae46bf..7d631aaa0ae1 100755 --- a/scripts/recordmcount.pl +++ b/scripts/recordmcount.pl @@ -189,7 +189,7 @@ if ($arch =~ /(x86(_64)?)|(i386)/) { $local_regex = "^[0-9a-fA-F]+\\s+t\\s+(\\S+)"; $weak_regex = "^[0-9a-fA-F]+\\s+([wW])\\s+(\\S+)"; $section_regex = "Disassembly of section\\s+(\\S+):"; -$function_regex = "^([0-9a-fA-F]+)\\s+<(.*?)>:"; +$function_regex = "^([0-9a-fA-F]+)\\s+<([^^]*?)>:"; $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s(mcount|__fentry__)\$"; $section_type = '@progbits'; $mcount_adjust = 0; |