Commit 98ee74a7 authored by Frederic Weisbecker's avatar Frederic Weisbecker

Merge branch 'perf/urgent' into perf/core

Conflicts:
	tools/perf/util/callchain.h

Merge reason:
	Fix a non-trivial conflict with latest fixes
parents 7de5d895 5225c458
...@@ -497,6 +497,8 @@ static int p4_hw_config(struct perf_event *event) ...@@ -497,6 +497,8 @@ static int p4_hw_config(struct perf_event *event)
event->hw.config |= event->attr.config & event->hw.config |= event->attr.config &
(p4_config_pack_escr(P4_ESCR_MASK_HT) | (p4_config_pack_escr(P4_ESCR_MASK_HT) |
p4_config_pack_cccr(P4_CCCR_MASK_HT | P4_CCCR_RESERVED)); p4_config_pack_cccr(P4_CCCR_MASK_HT | P4_CCCR_RESERVED));
event->hw.config &= ~P4_CCCR_FORCE_OVF;
} }
rc = x86_setup_perfctr(event); rc = x86_setup_perfctr(event);
......
...@@ -249,7 +249,7 @@ static int trace_lookup_stack(struct seq_file *m, long i) ...@@ -249,7 +249,7 @@ static int trace_lookup_stack(struct seq_file *m, long i)
{ {
unsigned long addr = stack_dump_trace[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) static void print_disabled(struct seq_file *m)
......
...@@ -57,6 +57,7 @@ static inline void callchain_init(struct callchain_root *root) ...@@ -57,6 +57,7 @@ static inline void callchain_init(struct callchain_root *root)
root->node.parent = NULL; root->node.parent = NULL;
root->node.hit = 0; root->node.hit = 0;
root->node.children_hit = 0;
root->max_depth = 0; root->max_depth = 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment