perf fixes
Subsystems (3)
Linus,
Please pull the latest perf-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git perf-fixes-for-linus
Thanks,
Ingo
------------------>
Anton Blanchard (1):
tracing/trace_stack: Fix stack trace on ppc64
Lin Ming (1):
perf, x86, Pentium4: Clear the P4_CCCR_FORCE_OVF flag
arch/x86/kernel/cpu/perf_event_p4.c | 2 ++ kernel/trace/trace_stack.c | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-)
arch/x86/kernel/cpu/perf_event_p4.c +2 -0
@@ -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);
kernel/trace/trace_stack.c +1 -1
@@ -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)