Skip to contentSkip to conversation

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

PATCH Paul Mackerras 1 participant 2 messages Jun 3, 2009 – Jun 4, 2009 PowerPC

lore
Share & tools
lore
#0 lore raw

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.

---
 arch/powerpc/kernel/perf_counter.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/powerpc/kernel/perf_counter.c +1 -1
index 4cc4ac5..232b00a 100644
@@ -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,
Signature · 1 line
1.6.0.4
#1 lore raw
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.

LKML-Reference: <[email protected]>

---
 arch/powerpc/kernel/perf_counter.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/powerpc/kernel/perf_counter.c +1 -1
index 4cc4ac5..232b00a 100644
@@ -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,