diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-25 10:50:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-25 10:50:07 -0700 |
| commit | d4348c678977c7093438bbbf2067c49396ae941b (patch) | |
| tree | c60752bc177c3297e28e62f759ddd5816fa52e19 | |
| parent | 37822188ef7bb41ae47b84ae283e6ac93cdafb9c (diff) | |
| parent | 8d330919927ea31fa083b5a80084dc991da813a0 (diff) | |
| download | op-kernel-dev-d4348c678977c7093438bbbf2067c49396ae941b.zip op-kernel-dev-d4348c678977c7093438bbbf2067c49396ae941b.tar.gz | |
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
perf, x86, Pentium4: Clear the P4_CCCR_FORCE_OVF flag
tracing/trace_stack: Fix stack trace on ppc64
| -rw-r--r-- | arch/x86/kernel/cpu/perf_event_p4.c | 2 | ||||
| -rw-r--r-- | kernel/trace/trace_stack.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/perf_event_p4.c b/arch/x86/kernel/cpu/perf_event_p4.c index febb12c..7e578e9 100644 --- a/arch/x86/kernel/cpu/perf_event_p4.c +++ b/arch/x86/kernel/cpu/perf_event_p4.c @@ -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); diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c index 056468e..a6b7e0e 100644 --- a/kernel/trace/trace_stack.c +++ b/kernel/trace/trace_stack.c @@ -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) |
