summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-08-25 15:34:21 +0200
committerIngo Molnar <mingo@elte.hu>2010-08-25 15:34:21 +0200
commit1a224c1c9c8df8462b32df3a5ba6e45247da1e09 (patch)
tree4c6a31fdbe8bfaa7224354792a1b0b5c46fe079d /kernel
parenta4bcb42f32c0e8044c0ad2c409e10679f6cc3e35 (diff)
parent8d330919927ea31fa083b5a80084dc991da813a0 (diff)
Merge branch 'perf/urgent' into auto-latest
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 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)
{
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)