lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'perf/urgent' into perf/core

Browse Source 
Conflicts:
	tools/perf/util/callchain.h

Merge reason:
	Fix a non-trivial conflict with latest fixes
This commit is contained in:
Frederic Weisbecker
2010-08-27 02:28:40 +02:00
parent 7de5d895b2 5225c45899
commit 98ee74a75c
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/trace/trace_stack.c
View File

@ -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)