git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[pandora-kernel.git]
/
arch
/
powerpc
/
kernel
/
ppc970-pmu.c
diff --git
a/arch/powerpc/kernel/ppc970-pmu.c
b/arch/powerpc/kernel/ppc970-pmu.c
index
8eff48e
..
3fee685
100644
(file)
--- a/
arch/powerpc/kernel/ppc970-pmu.c
+++ b/
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;