A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-24 21:54:34 -04:00
Code Issues Projects Releases Packages 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
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)