diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-15 21:31:30 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-15 21:31:30 -0400 |
commit | a926021cb1f8a99a275eaf6eb546102e9469dc59 (patch) | |
tree | c6d0300cd4b1a1fd658708476db4577b68b4de31 /scripts | |
parent | 0586bed3e8563c2eb89bc7256e30ce633ae06cfb (diff) | |
parent | 5e814dd597c42daeb8d2a276e64a6ec986ad0e2a (diff) |
Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (184 commits)
perf probe: Clean up probe_point_lazy_walker() return value
tracing: Fix irqoff selftest expanding max buffer
tracing: Align 4 byte ints together in struct tracer
tracing: Export trace_set_clr_event()
tracing: Explain about unstable clock on resume with ring buffer warning
ftrace/graph: Trace function entry before updating index
ftrace: Add .ref.text as one of the safe areas to trace
tracing: Adjust conditional expression latency formatting.
tracing: Fix event alignment: skb:kfree_skb
tracing: Fix event alignment: mce:mce_record
tracing: Fix event alignment: kvm:kvm_hv_hypercall
tracing: Fix event alignment: module:module_request
tracing: Fix event alignment: ftrace:context_switch and ftrace:wakeup
tracing: Remove lock_depth from event entry
perf header: Stop using 'self'
perf session: Use evlist/evsel for managing perf.data attributes
perf top: Don't let events to eat up whole header line
perf top: Fix events overflow in top command
ring-buffer: Remove unused #include <linux/trace_irq.h>
tracing: Add an 'overwrite' trace_option.
...
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/kconfig/streamline_config.pl | 2 | ||||
-rw-r--r-- | scripts/recordmcount.c | 3 | ||||
-rwxr-xr-x | scripts/recordmcount.pl | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl index fd81fc33d63..a4fe923c013 100644 --- a/scripts/kconfig/streamline_config.pl +++ b/scripts/kconfig/streamline_config.pl | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/perl -w | 1 | #!/usr/bin/perl -w |
2 | # | 2 | # |
3 | # Copywrite 2005-2009 - Steven Rostedt | 3 | # Copyright 2005-2009 - Steven Rostedt |
4 | # Licensed under the terms of the GNU GPL License version 2 | 4 | # Licensed under the terms of the GNU GPL License version 2 |
5 | # | 5 | # |
6 | # It's simple enough to figure out how this works. | 6 | # It's simple enough to figure out how this works. |
diff --git a/scripts/recordmcount.c b/scripts/recordmcount.c index 038b3d1e298..f9f6f52db77 100644 --- a/scripts/recordmcount.c +++ b/scripts/recordmcount.c | |||
@@ -206,7 +206,8 @@ static uint32_t (*w2)(uint16_t); | |||
206 | static int | 206 | static int |
207 | is_mcounted_section_name(char const *const txtname) | 207 | is_mcounted_section_name(char const *const txtname) |
208 | { | 208 | { |
209 | return 0 == strcmp(".text", txtname) || | 209 | return 0 == strcmp(".text", txtname) || |
210 | 0 == strcmp(".ref.text", txtname) || | ||
210 | 0 == strcmp(".sched.text", txtname) || | 211 | 0 == strcmp(".sched.text", txtname) || |
211 | 0 == strcmp(".spinlock.text", txtname) || | 212 | 0 == strcmp(".spinlock.text", txtname) || |
212 | 0 == strcmp(".irqentry.text", txtname) || | 213 | 0 == strcmp(".irqentry.text", txtname) || |
diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl index 1d7963f4ee7..4be0deea71c 100755 --- a/scripts/recordmcount.pl +++ b/scripts/recordmcount.pl | |||
@@ -130,6 +130,7 @@ if ($inputfile =~ m,kernel/trace/ftrace\.o$,) { | |||
130 | # Acceptable sections to record. | 130 | # Acceptable sections to record. |
131 | my %text_sections = ( | 131 | my %text_sections = ( |
132 | ".text" => 1, | 132 | ".text" => 1, |
133 | ".ref.text" => 1, | ||
133 | ".sched.text" => 1, | 134 | ".sched.text" => 1, |
134 | ".spinlock.text" => 1, | 135 | ".spinlock.text" => 1, |
135 | ".irqentry.text" => 1, | 136 | ".irqentry.text" => 1, |