2009-06-03 23:50:22

by Paul Mackerras

Subject: perf_counter: powerpc: Use new identifier names in powerpc-specific code

Commit b23f3325 ("perf_counter: Rename various fields") fixed up
most of the uses of the renamed fields, but missed one instance
of "record_type" in powerpc-specific code which needs to be changed
to "sample_type", and a "PERF_RECORD_ADDR" in the same statement that
needs to be changed to "PERF_SAMPLE_ADDR", causing compilation
errors on powerpc. This fixes it.

Signed-off-by: Paul Mackerras <[email protected]>
---
arch/powerpc/kernel/perf_counter.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/kernel/perf_counter.c b/arch/powerpc/kernel/perf_counter.c
index 4cc4ac5..232b00a 100644
--- a/arch/powerpc/kernel/perf_counter.c
+++ b/arch/powerpc/kernel/perf_counter.c
@@ -1002,7 +1002,7 @@ static void record_and_restart(struct perf_counter *counter, long val,
*/
if (record) {
addr = 0;
- if (counter->attr.record_type & PERF_RECORD_ADDR) {
+ if (counter->attr.sample_type & PERF_SAMPLE_ADDR) {
/*
* The user wants a data address recorded.
* If we're not doing instruction sampling,
--
1.6.0.4

2009-06-04 11:22:51

by Paul Mackerras

Subject: [tip:perfcounters/core] perf_counter: powerpc: Use new identifier names in powerpc-specific code

Commit-ID: 1b58c2515be48d5df79d20210ac5a86e30094de2
Gitweb: http://git.kernel.org/tip/1b58c2515be48d5df79d20210ac5a86e30094de2
Author: Paul Mackerras <[email protected]>
AuthorDate: Thu, 4 Jun 2009 09:49:59 +1000
Committer: Ingo Molnar <[email protected]>
CommitDate: Thu, 4 Jun 2009 13:20:11 +0200

perf_counter: powerpc: Use new identifier names in powerpc-specific code

Commit b23f3325 ("perf_counter: Rename various fields") fixed up
most of the uses of the renamed fields, but missed one instance
of "record_type" in powerpc-specific code which needs to be changed
to "sample_type", and a "PERF_RECORD_ADDR" in the same statement that
needs to be changed to "PERF_SAMPLE_ADDR", causing compilation
errors on powerpc. This fixes it.

Signed-off-by: Paul Mackerras <[email protected]>
Cc: Peter Zijlstra <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>


---
arch/powerpc/kernel/perf_counter.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/kernel/perf_counter.c b/arch/powerpc/kernel/perf_counter.c
index 4cc4ac5..232b00a 100644
--- a/arch/powerpc/kernel/perf_counter.c
+++ b/arch/powerpc/kernel/perf_counter.c
@@ -1002,7 +1002,7 @@ static void record_and_restart(struct perf_counter *counter, long val,
*/
if (record) {
addr = 0;
- if (counter->attr.record_type & PERF_RECORD_ADDR) {
+ if (counter->attr.sample_type & PERF_SAMPLE_ADDR) {
/*
* The user wants a data address recorded.
* If we're not doing instruction sampling,