From 5525a51ac890d0a815ed77419e8053deb7d840c5 Mon Sep 17 00:00:00 2001 From: Anshuman Khandual Date: Thu, 8 Sep 2011 21:12:06 +0000 Subject: [PATCH] --- yaml --- r: 274195 b: refs/heads/master c: a120db06c3f435c37d028b6e5a1968dad06b7df0 h: refs/heads/master i: 274193: f717cbb66fa43c3046a62bda1e65bfb5ba7aaf3f 274191: bfe43cf8655d154fe042d5e0ec7be9e68bfb19f2 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/power7-pmu.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 1d82adc64937..391b9c9e8329 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 82ba129baeb1ff72e75d93e70534ba50312153f3 +refs/heads/master: a120db06c3f435c37d028b6e5a1968dad06b7df0 diff --git a/trunk/arch/powerpc/kernel/power7-pmu.c b/trunk/arch/powerpc/kernel/power7-pmu.c index de83d6060dda..1251e4d7e262 100644 --- a/trunk/arch/powerpc/kernel/power7-pmu.c +++ b/trunk/arch/powerpc/kernel/power7-pmu.c @@ -297,6 +297,8 @@ static void power7_disable_pmc(unsigned int pmc, unsigned long mmcr[]) static int power7_generic_events[] = { [PERF_COUNT_HW_CPU_CYCLES] = 0x1e, + [PERF_COUNT_HW_STALLED_CYCLES_FRONTEND] = 0x100f8, /* GCT_NOSLOT_CYC */ + [PERF_COUNT_HW_STALLED_CYCLES_BACKEND] = 0x4000a, /* CMPLU_STALL */ [PERF_COUNT_HW_INSTRUCTIONS] = 2, [PERF_COUNT_HW_CACHE_REFERENCES] = 0xc880, /* LD_REF_L1_LSU*/ [PERF_COUNT_HW_CACHE_MISSES] = 0x400f0, /* LD_MISS_L1 */