renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-11-18 23:54:26 +08:00
Code

Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/core

Browse Source
This commit is contained in:
Ingo Molnar 2010-08-30 08:55:38 +02:00
commit 3449dafaf5
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/kernel/cpu/perf_event_p4.c
View File

@ -497,6 +497,8 @@ static int p4_hw_config(struct perf_event *event)
event->hw.config |= event->attr.config &
(p4_config_pack_escr(P4_ESCR_MASK_HT) |
p4_config_pack_cccr(P4_CCCR_MASK_HT | P4_CCCR_RESERVED));
event->hw.config &= ~P4_CCCR_FORCE_OVF;
}
rc = x86_setup_perfctr(event);

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)

1
tools/perf/util/callchain.h
View File

@ -57,6 +57,7 @@ static inline void callchain_init(struct callchain_root *root)
root->node.parent = NULL;
root->node.hit = 0;
root->node.children_hit = 0;
root->max_depth = 0;
}