* [PowerPC] 2.6.30-git3 build break : perf counters @ 2009-06-12 5:51 Sachin Sant 2009-06-12 6:13 ` Jaswinder Singh Rajput 2009-06-12 6:34 ` Jaswinder Singh Rajput 0 siblings, 2 replies; 6+ messages in thread From: Sachin Sant @ 2009-06-12 5:51 UTC (permalink / raw) To: Paul Mackerras; +Cc: linuxppc-dev, linux-kernel 2.6.30-git3 build with CONFIG_PERF_COUNTERS=y failed on a powerpc box. CC arch/powerpc/kernel/power7-pmu.o arch/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 -- --------------------------------- Sachin Sant IBM Linux Technology Center India Systems and Technology Labs Bangalore, India --------------------------------- ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PowerPC] 2.6.30-git3 build break : perf counters 2009-06-12 5:51 [PowerPC] 2.6.30-git3 build break : perf counters Sachin Sant @ 2009-06-12 6:13 ` Jaswinder Singh Rajput 2009-06-12 6:34 ` Jaswinder Singh Rajput 1 sibling, 0 replies; 6+ messages in thread From: Jaswinder Singh Rajput @ 2009-06-12 6:13 UTC (permalink / raw) To: Sachin Sant; +Cc: Paul Mackerras, linuxppc-dev, linux-kernel, Ingo Molnar Hello Sachin, On Fri, 2009-06-12 at 11:21 +0530, Sachin Sant wrote: > 2.6.30-git3 build with CONFIG_PERF_COUNTERS=y failed on a powerpc box. > > CC arch/powerpc/kernel/power7-pmu.o > arch/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>...... > Is this fix your problem : diff --git a/arch/powerpc/kernel/power7-pmu.c b/arch/powerpc/kernel/power7-pmu.c index b3f7d12..fb72404 100644 --- a/arch/powerpc/kernel/power7-pmu.c +++ b/arch/powerpc/kernel/power7-pmu.c @@ -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 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PowerPC] 2.6.30-git3 build break : perf counters 2009-06-12 5:51 [PowerPC] 2.6.30-git3 build break : perf counters Sachin Sant 2009-06-12 6:13 ` Jaswinder Singh Rajput @ 2009-06-12 6:34 ` Jaswinder Singh Rajput 2009-06-12 8:16 ` Sachin Sant ` (2 more replies) 1 sibling, 3 replies; 6+ messages in thread From: Jaswinder Singh Rajput @ 2009-06-12 6:34 UTC (permalink / raw) To: Sachin Sant; +Cc: Paul Mackerras, linuxppc-dev, linux-kernel, Ingo Molnar On Fri, 2009-06-12 at 11:21 +0530, Sachin Sant wrote: > 2.6.30-git3 build with CONFIG_PERF_COUNTERS=y failed on a powerpc box. > > CC arch/powerpc/kernel/power7-pmu.o > arch/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 > Please check this patch : [PATCH] powerpc: perf_counter fix performance counter event types Fix compilation warnings : CC arch/powerpc/kernel/power7-pmu.o arch/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>...... Reported-by: Sachin Sant <sachinp@in.ibm.com> Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com> --- arch/powerpc/kernel/power7-pmu.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/powerpc/kernel/power7-pmu.c b/arch/powerpc/kernel/power7-pmu.c index b3f7d12..b72e7a1 100644 --- a/arch/powerpc/kernel/power7-pmu.c +++ b/arch/powerpc/kernel/power7-pmu.c @@ -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 -- 1.6.3.2 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PowerPC] 2.6.30-git3 build break : perf counters 2009-06-12 6:34 ` Jaswinder Singh Rajput @ 2009-06-12 8:16 ` Sachin Sant 2009-06-12 8:25 ` Stephen Rothwell 2009-06-12 12:24 ` [tip:perfcounters/core] powerpc, perf_counter: Fix performance counter event types tip-bot for Jaswinder Singh Rajput 2 siblings, 0 replies; 6+ messages in thread From: Sachin Sant @ 2009-06-12 8:16 UTC (permalink / raw) To: Jaswinder Singh Rajput Cc: Paul Mackerras, linuxppc-dev, linux-kernel, Ingo Molnar Jaswinder Singh Rajput wrote: > Please check this patch : > > [PATCH] powerpc: perf_counter fix performance counter event types > > Fix compilation warnings : > CC arch/powerpc/kernel/power7-pmu.o > arch/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>...... > > Reported-by: Sachin Sant <sachinp@in.ibm.com> > Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com> > --- > Yes this fixed the build error. Thanks -Sachin -- --------------------------------- Sachin Sant IBM Linux Technology Center India Systems and Technology Labs Bangalore, India --------------------------------- ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PowerPC] 2.6.30-git3 build break : perf counters 2009-06-12 6:34 ` Jaswinder Singh Rajput 2009-06-12 8:16 ` Sachin Sant @ 2009-06-12 8:25 ` Stephen Rothwell 2009-06-12 12:24 ` [tip:perfcounters/core] powerpc, perf_counter: Fix performance counter event types tip-bot for Jaswinder Singh Rajput 2 siblings, 0 replies; 6+ messages in thread From: Stephen Rothwell @ 2009-06-12 8:25 UTC (permalink / raw) To: Jaswinder Singh Rajput Cc: Sachin Sant, linuxppc-dev, Ingo Molnar, Paul Mackerras, linux-kernel [-- Attachment #1: Type: text/plain, Size: 1100 bytes --] Hi Jaswinder, On Fri, 12 Jun 2009 12:04:54 +0530 Jaswinder Singh Rajput <jaswinder@kernel.org> wrote: > > Please check this patch : > > [PATCH] powerpc: perf_counter fix performance counter event types > > Fix compilation warnings : > CC arch/powerpc/kernel/power7-pmu.o > arch/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>...... > > Reported-by: Sachin Sant <sachinp@in.ibm.com> > Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com> I have applied this to linux-next for today. Thanks. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* [tip:perfcounters/core] powerpc, perf_counter: Fix performance counter event types 2009-06-12 6:34 ` Jaswinder Singh Rajput 2009-06-12 8:16 ` Sachin Sant 2009-06-12 8:25 ` Stephen Rothwell @ 2009-06-12 12:24 ` tip-bot for Jaswinder Singh Rajput 2 siblings, 0 replies; 6+ messages in thread From: tip-bot for Jaswinder Singh Rajput @ 2009-06-12 12:24 UTC (permalink / raw) To: linux-tip-commits Cc: linux-kernel, paulus, hpa, mingo, jaswinder, sachinp, jaswinderrajput, tglx, mingo Commit-ID: 4c921126fe553440261f56691c5f60fbaaa486d6 Gitweb: http://git.kernel.org/tip/4c921126fe553440261f56691c5f60fbaaa486d6 Author: Jaswinder Singh Rajput <jaswinder@kernel.org> AuthorDate: Fri, 12 Jun 2009 12:04:54 +0530 Committer: Ingo Molnar <mingo@elte.hu> 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.o arch/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. Reported-by: Sachin Sant <sachinp@in.ibm.com> Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com> Cc: Paul Mackerras <paulus@samba.org> Cc: linuxppc-dev@ozlabs.org LKML-Reference: <1244788494.5554.1.camel@ht.satnam> Signed-off-by: Ingo Molnar <mingo@elte.hu> --- arch/powerpc/kernel/power7-pmu.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/powerpc/kernel/power7-pmu.c b/arch/powerpc/kernel/power7-pmu.c index b3f7d12..b72e7a1 100644 --- a/arch/powerpc/kernel/power7-pmu.c +++ b/arch/powerpc/kernel/power7-pmu.c @@ -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 ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2009-06-12 12:25 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2009-06-12 5:51 [PowerPC] 2.6.30-git3 build break : perf counters Sachin Sant 2009-06-12 6:13 ` Jaswinder Singh Rajput 2009-06-12 6:34 ` Jaswinder Singh Rajput 2009-06-12 8:16 ` Sachin Sant 2009-06-12 8:25 ` Stephen Rothwell 2009-06-12 12:24 ` [tip:perfcounters/core] powerpc, perf_counter: Fix performance counter event types tip-bot for Jaswinder Singh Rajput
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox
Powered by JetHome