From abe76a5bdb0a4ded0d941c27d8631da22cfb1658 Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Thu, 9 Sep 2010 19:02:40 +0000 Subject: [PATCH] --- yaml --- r: 212856 b: refs/heads/master c: 9f5f9ffe50e90ed73040d2100db8bfc341cee352 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/ppc970-pmu.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 8f05ad406097..00a3c1b33fad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1ef21199a5d98702755cfa0df39b8b5112c423d6 +refs/heads/master: 9f5f9ffe50e90ed73040d2100db8bfc341cee352 diff --git a/trunk/arch/powerpc/kernel/ppc970-pmu.c b/trunk/arch/powerpc/kernel/ppc970-pmu.c index 8eff48e20dba..3fee685de4df 100644 --- a/trunk/arch/powerpc/kernel/ppc970-pmu.c +++ b/trunk/arch/powerpc/kernel/ppc970-pmu.c @@ -169,9 +169,11 @@ static int p970_marked_instr_event(u64 event) switch (unit) { case PM_VPU: mask = 0x4c; /* byte 0 bits 2,3,6 */ + break; case PM_LSU0: /* byte 2 bits 0,2,3,4,6; all of byte 1 */ mask = 0x085dff00; + break; case PM_LSU1L: mask = 0x50 << 24; /* byte 3 bits 4,6 */ break;