aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-25 10:50:07 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-25 10:50:07 -0700
commitd4348c678977c7093438bbbf2067c49396ae941b (patch)
treec60752bc177c3297e28e62f759ddd5816fa52e19 /kernel
parent37822188ef7bb41ae47b84ae283e6ac93cdafb9c (diff)
parent8d330919927ea31fa083b5a80084dc991da813a0 (diff)
downloadmrst-s0i3-test-d4348c678977c7093438bbbf2067c49396ae941b.tar.gz
mrst-s0i3-test-d4348c678977c7093438bbbf2067c49396ae941b.tar.xz
mrst-s0i3-test-d4348c678977c7093438bbbf2067c49396ae941b.zip
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: perf, x86, Pentium4: Clear the P4_CCCR_FORCE_OVF flag tracing/trace_stack: Fix stack trace on ppc64
Diffstat (limited to 'kernel')
-rw-r--r--kernel/trace/trace_stack.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
index 056468eae7c..a6b7e0e0f3e 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)
{
unsigned long addr = stack_dump_trace[i];
- return seq_printf(m, "%pF\n", (void *)addr);
+ return seq_printf(m, "%pS\n", (void *)addr);
}
static void print_disabled(struct seq_file *m)