2.6.30-git3 build break : perf counters
2.6.30-git3 build with CONFIG_PERF_COUNTERS=y failed on a powerpc box.
CC arch/powerpc/kernel/power7-pmu.oarch/powerpc/kernel/power7-pmu.c:297: error: PERF_COUNT_CPU_CYCLES undeclared here (not in a function) arch/powerpc/kernel/power7-pmu.c:297: error: array index in initializer not of integer type arch/powerpc/kernel/power7-pmu.c:297: error: (near initialization for power7_generic_events) arch/powerpc/kernel/power7-pmu.c:298: error: PERF_COUNT_INSTRUCTIONS undeclared here (not in a function) arch/powerpc/kernel/power7-pmu.c:298: error: array index in initializer not of integer type ......<SNIP>......
Porbably because of commit 526e9a09d2e2dcb6c75c68710465678bb647e5fe
Thanks
-Sachin
Signature · 6 lines
--------------------------------- Sachin Sant IBM Linux Technology Center India Systems and Technology Labs Bangalore, India ---------------------------------
Hello Sachin,
Quoted 10 lines · Sachin Sant
2.6.30-git3 build with
CONFIG_PERF_COUNTERS=yfailed on a powerpc box.CC
arch/powerpc/kernel/power7-pmu.oarch/powerpc/kernel/power7-pmu.c:297: error:PERF_COUNT_CPU_CYCLESundeclared here (not in a function)arch/powerpc/kernel/power7-pmu.c:297: error: array index in initializer not of integer typearch/powerpc/kernel/power7-pmu.c:297: error: (near initialization forpower7_generic_events)arch/powerpc/kernel/power7-pmu.c:298: error:PERF_COUNT_INSTRUCTIONSundeclared here (not in a function)arch/powerpc/kernel/power7-pmu.c:298: error: array index in initializer not of integer type ......<SNIP>......
Is this fix your problem :
arch/powerpc/kernel/power7-pmu.c +6 -6
@@ -294,12 +294,12 @@ static void power7_disable_pmc(unsigned int pmc, u64 mmcr[]) }static int power7_generic_events[] = { - [PERF_COUNT_CPU_CYCLES ] =0x1e , - [PERF_COUNT_INSTRUCTIONS ] =2 , - [PERF_COUNT_CACHE_REFERENCES ] =0xc880 ,/* LD_REF_L1_LSU */ - [PERF_COUNT_CACHE_MISSES ] =0x400f0 ,/* LD_MISS_L1 */ - [PERF_COUNT_BRANCH_INSTRUCTIONS ] =0x10068 ,/* BRU_FIN */ - [PERF_COUNT_BRANCH_MISSES ] =0x400f6 ,/* BR_MPRED */ + [PERF_COUNT_HW_CPU_CYCLES ] =0x1e , + [PERF_COUNT_HW_INSTRUCTIONS ] =2 , + [PERF_COUNT_HW_CACHE_REFERENCES ] =0xc880 ,/* LD_REF_L1_LSU */ + [PERF_COUNT_HW_CACHE_MISSES ] =0x400f0 ,/* LD_MISS_L1 */ + [PERF_COUNT_HW_BRANCH_INSTRUCTIONS ] =0x10068 ,/* BRU_FIN */ + [PERF_COUNT_HW_BRANCH_MISSES ] =0x400f6 ,/* BR_MPRED */ };#define C (x) PERF_COUNT_HW_CACHE_##x
Quoted 10 lines · Sachin Sant
2.6.30-git3 build with
CONFIG_PERF_COUNTERS=yfailed on a powerpc box.CC
arch/powerpc/kernel/power7-pmu.oarch/powerpc/kernel/power7-pmu.c:297: error:PERF_COUNT_CPU_CYCLESundeclared here (not in a function)arch/powerpc/kernel/power7-pmu.c:297: error: array index in initializer not of integer typearch/powerpc/kernel/power7-pmu.c:297: error: (near initialization forpower7_generic_events)arch/powerpc/kernel/power7-pmu.c:298: error:PERF_COUNT_INSTRUCTIONSundeclared here (not in a function)arch/powerpc/kernel/power7-pmu.c:298: error: array index in initializer not of integer type ......<SNIP>......
Quoted 2 lines
Porbably because of commit
526e9a09d2e2dcb6c75c68710465678bb647e5fe
Please check this patch :
[PATCH] powerpc: perf_counter fix performance counter event types
Fix compilation warnings :
CC arch/powerpc/kernel/power7-pmu.oarch/powerpc/kernel/power7-pmu.c:297: error: PERF_COUNT_CPU_CYCLES undeclared here (not in a function) arch/powerpc/kernel/power7-pmu.c:297: error: array index in initializer not of integer type arch/powerpc/kernel/power7-pmu.c:297: error: (near initialization for power7_generic_events) arch/powerpc/kernel/power7-pmu.c:298: error: PERF_COUNT_INSTRUCTIONS undeclared here (not in a function) arch/powerpc/kernel/power7-pmu.c:298: error: array index in initializer not of integer type ......<SNIP>......
--- arch/powerpc/kernel/power7-pmu.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)
arch/powerpc/kernel/power7-pmu.c +6 -6
@@ -294,12 +294,12 @@ static void power7_disable_pmc(unsigned int pmc, u64 mmcr[]) }static int power7_generic_events[] = { - [PERF_COUNT_CPU_CYCLES ] =0x1e , - [PERF_COUNT_INSTRUCTIONS ] =2 , - [PERF_COUNT_CACHE_REFERENCES ] =0xc880 ,/* LD_REF_L1_LSU */ - [PERF_COUNT_CACHE_MISSES ] =0x400f0 ,/* LD_MISS_L1 */ - [PERF_COUNT_BRANCH_INSTRUCTIONS ] =0x10068 ,/* BRU_FIN */ - [PERF_COUNT_BRANCH_MISSES ] =0x400f6 ,/* BR_MPRED */ + [PERF_COUNT_HW_CPU_CYCLES ] =0x1e , + [PERF_COUNT_HW_INSTRUCTIONS ] =2 , + [PERF_COUNT_HW_CACHE_REFERENCES ] =0xc880 ,/* LD_REF_L1_LSU*/ + [PERF_COUNT_HW_CACHE_MISSES ] =0x400f0 ,/* LD_MISS_L1 */ + [PERF_COUNT_HW_BRANCH_INSTRUCTIONS ] =0x10068 ,/* BRU_FIN */ + [PERF_COUNT_HW_BRANCH_MISSES ] =0x400f6 ,/* BR_MPRED */ };#define C (x) PERF_COUNT_HW_CACHE_##x
Signature · 1 line
1.6.3.2
Quoted 13 lines · Jaswinder Singh Rajput
Please check this patch :
[PATCH] powerpc:
perf_counterfix performance counter event typesFix compilation warnings :
CCarch/powerpc/kernel/power7-pmu.oarch/powerpc/kernel/power7-pmu.c:297: error:PERF_COUNT_CPU_CYCLESundeclared here (not in a function)arch/powerpc/kernel/power7-pmu.c:297: error: array index in initializer not of integer typearch/powerpc/kernel/power7-pmu.c:297: error: (near initialization forpower7_generic_events)arch/powerpc/kernel/power7-pmu.c:298: error:PERF_COUNT_INSTRUCTIONSundeclared here (not in a function)arch/powerpc/kernel/power7-pmu.c:298: error: array index in initializer not of integer type ......<SNIP>......
Quoted 4 lines
Reported-by Sachin Sant <[email protected]>Signed-off-by Jaswinder Singh Rajput <[email protected]>---
Yes this fixed the build error.
Thanks
-Sachin
Signature · 6 lines
--------------------------------- Sachin Sant IBM Linux Technology Center India Systems and Technology Labs Bangalore, India ---------------------------------
Stephen Rothwell
AppliedHi Jaswinder,
Quoted 14 lines · On Fri, 12 Jun 2009 12:04:54 +0530 Jaswinder Singh Rajput…
Please check this patch :
[PATCH] powerpc:
perf_counterfix performance counter event typesFix compilation warnings :
CCarch/powerpc/kernel/power7-pmu.oarch/powerpc/kernel/power7-pmu.c:297: error:PERF_COUNT_CPU_CYCLESundeclared here (not in a function)arch/powerpc/kernel/power7-pmu.c:297: error: array index in initializer not of integer typearch/powerpc/kernel/power7-pmu.c:297: error: (near initialization forpower7_generic_events)arch/powerpc/kernel/power7-pmu.c:298: error:PERF_COUNT_INSTRUCTIONSundeclared here (not in a function)arch/powerpc/kernel/power7-pmu.c:298: error: array index in initializer not of integer type ......<SNIP>......
Quoted 2 lines
Reported-by Sachin Sant <[email protected]>Signed-off-by Jaswinder Singh Rajput <[email protected]>
I have applied this to linux-next for today. Thanks.
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
[tip:perfcounters/core] powerpc, perf_counter: Fix performance counter event types
In reply to Jaswinder Singh RajputCommit-ID: 4c921126fe553440261f56691c5f60fbaaa486d6 Gitweb: http://git.kernel.org/tip/4c921126fe553440261f56691c5f60fbaaa486d6 Author: Jaswinder Singh Rajput <[email protected]> AuthorDate: Fri, 12 Jun 2009 12:04:54 +0530 Committer: Ingo Molnar <[email protected]> CommitDate: Fri, 12 Jun 2009 14:21:11 +0200
powerpc, perf_counter: Fix performance counter event types
Sachin Sant reported these compiler errors:
CC arch/powerpc/kernel/power7-pmu.oarch/powerpc/kernel/power7-pmu.c:297: error: PERF_COUNT_CPU_CYCLES undeclared here (not in a function)
Which happened because a last-minute rename of symbols crossed with the Power7 support patch.
Fix this by using the new symbol names.
LKML-Reference: <[email protected]>
--- arch/powerpc/kernel/power7-pmu.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)
arch/powerpc/kernel/power7-pmu.c +6 -6
@@ -294,12 +294,12 @@ static void power7_disable_pmc(unsigned int pmc, u64 mmcr[]) }static int power7_generic_events[] = { - [PERF_COUNT_CPU_CYCLES ] =0x1e , - [PERF_COUNT_INSTRUCTIONS ] =2 , - [PERF_COUNT_CACHE_REFERENCES ] =0xc880 ,/* LD_REF_L1_LSU */ - [PERF_COUNT_CACHE_MISSES ] =0x400f0 ,/* LD_MISS_L1 */ - [PERF_COUNT_BRANCH_INSTRUCTIONS ] =0x10068 ,/* BRU_FIN */ - [PERF_COUNT_BRANCH_MISSES ] =0x400f6 ,/* BR_MPRED */ + [PERF_COUNT_HW_CPU_CYCLES ] =0x1e , + [PERF_COUNT_HW_INSTRUCTIONS ] =2 , + [PERF_COUNT_HW_CACHE_REFERENCES ] =0xc880 ,/* LD_REF_L1_LSU*/ + [PERF_COUNT_HW_CACHE_MISSES ] =0x400f0 ,/* LD_MISS_L1 */ + [PERF_COUNT_HW_BRANCH_INSTRUCTIONS ] =0x10068 ,/* BRU_FIN */ + [PERF_COUNT_HW_BRANCH_MISSES ] =0x400f6 ,/* BR_MPRED */ };#define C (x) PERF_COUNT_HW_CACHE_##x