summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-07-23 09:10:29 +0200
committerIngo Molnar <mingo@elte.hu>2010-07-23 09:10:29 +0200
commit3a01736e70a7d629140695ba46a901266b4460cc (patch)
tree49ff8ce1e7c6a267f0ce84b5daddbe6666bc4253 /scripts
parentx86 cpufreq, perf: Make trace_power_frequency cpufreq driver independent (diff)
parenttrace: strlen() return doesn't account for the NULL (diff)
downloadlinux-3a01736e70a7d629140695ba46a901266b4460cc.tar.xz
linux-3a01736e70a7d629140695ba46a901266b4460cc.zip
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/recordmcount.pl2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl
index f3c9c0a90b98..0171060b5fd6 100755
--- a/scripts/recordmcount.pl
+++ b/scripts/recordmcount.pl
@@ -326,7 +326,7 @@ if ($arch eq "x86_64") {
# 14: R_MIPS_NONE *ABS*
# 18: 00020021 nop
if ($is_module eq "0") {
- $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s_mcount\$";
+ $mcount_regex = "^\\s*([0-9a-fA-F]+): R_MIPS_26\\s+_mcount\$";
} else {
$mcount_regex = "^\\s*([0-9a-fA-F]+): R_MIPS_HI16\\s+_mcount\$";
}