Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

torvalds · torvalds · commit d4348c678977 · 2010-08-25T10:50:07.000-07:00
* '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
diff --git 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
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -497,6 +497,8 @@ static int p4_hw_config(struct perf_event *event)`
`497`	`497`	`event->hw.config \|= event->attr.config &`
`498`	`498`	`(p4_config_pack_escr(P4_ESCR_MASK_HT) \|`
`499`	`499`	`p4_config_pack_cccr(P4_CCCR_MASK_HT \| P4_CCCR_RESERVED));`
	`500`	`+`
	`501`	`+ event->hw.config &= ~P4_CCCR_FORCE_OVF;`
`500`	`502`	`}`
`501`	`503`
`502`	`504`	`rc = x86_setup_perfctr(event);`
Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ static int trace_lookup_stack(struct seq_file *m, long i)`
`249`	`249`	`{`
`250`	`250`	`unsigned long addr = stack_dump_trace[i];`
`251`	`251`
`252`		`- return seq_printf(m, "%pF\n", (void *)addr);`
	`252`	`+ return seq_printf(m, "%pS\n", (void *)addr);`
`253`	`253`	`}`
`254`	`254`
`255`	`255`	`static void print_disabled(struct seq_file *m)`