diff options
| author | Frederic Weisbecker <fweisbec@gmail.com> | 2010-08-26 20:28:40 -0400 |
|---|---|---|
| committer | Frederic Weisbecker <fweisbec@gmail.com> | 2010-08-26 20:30:07 -0400 |
| commit | 98ee74a75ca0f047e75400afa712f7bf08268b8e (patch) | |
| tree | c87b267f1e279173696f2294b3930940f1a5b570 /kernel/trace | |
| parent | 7de5d895b2020260190db0021de646f3f22f755e (diff) | |
| parent | 5225c45899e872383ca39f5533d28ec63c54b39e (diff) | |
Merge branch 'perf/urgent' into perf/core
Conflicts:
tools/perf/util/callchain.h
Merge reason:
Fix a non-trivial conflict with latest fixes
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/trace_stack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c index 056468eae7cf..a6b7e0e0f3eb 100644 --- a/kernel/trace/trace_stack.c +++ b/kernel/trace/trace_stack.c | |||
| @@ -249,7 +249,7 @@ static int trace_lookup_stack(struct seq_file *m, long i) | |||
| 249 | { | 249 | { |
| 250 | unsigned long addr = stack_dump_trace[i]; | 250 | unsigned long addr = stack_dump_trace[i]; |
| 251 | 251 | ||
| 252 | return seq_printf(m, "%pF\n", (void *)addr); | 252 | return seq_printf(m, "%pS\n", (void *)addr); |
| 253 | } | 253 | } |
| 254 | 254 | ||
| 255 | static void print_disabled(struct seq_file *m) | 255 | static void print_disabled(struct seq_file *m) |