summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorCarl E. Love <cel@linux.vnet.ibm.com>2012-11-29 06:42:03 +0000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2013-01-29 10:18:14 +1100
commit46ed7a76ae7770cb8ba733ee2b06273397ad8b5b (patch)
treef0b0f73d2bb546d82f15d8ae98115932f70fc8f9 /arch
parent72640d880350165c3a7b8f2e4fb4bf852ea7b606 (diff)
downloadlinux-46ed7a76ae7770cb8ba733ee2b06273397ad8b5b.tar.gz
linux-46ed7a76ae7770cb8ba733ee2b06273397ad8b5b.tar.bz2
linux-46ed7a76ae7770cb8ba733ee2b06273397ad8b5b.zip
powerpc/oprofile: Fix error in oprofile power7_marked_instr_event() function
The calculation for the left shift of the mask OPROFILE_PM_PMCSEL_MSK has an error. The calculation is should be to shift left by (max_cntrs - cntr) times the width of the pmsel field width. However, the #define OPROFILE_MAX_PMC_NUM was used instead of OPROFILE_PMSEL_FIELD_WIDTH. This patch fixes the calculation. Signed-off-by: Carl Love <cel@us.ibm.com> Acked-by: Paul Mackerras <paulus@samba.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/oprofile/op_model_power4.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/oprofile/op_model_power4.c b/arch/powerpc/oprofile/op_model_power4.c
index 315f9495e9b2..f444b94935f5 100644
--- a/arch/powerpc/oprofile/op_model_power4.c
+++ b/arch/powerpc/oprofile/op_model_power4.c
@@ -52,7 +52,7 @@ static int power7_marked_instr_event(u64 mmcr1)
for (pmc = 0; pmc < 4; pmc++) {
psel = mmcr1 & (OPROFILE_PM_PMCSEL_MSK
<< (OPROFILE_MAX_PMC_NUM - pmc)
- * OPROFILE_MAX_PMC_NUM);
+ * OPROFILE_PMSEL_FIELD_WIDTH);
psel = (psel >> ((OPROFILE_MAX_PMC_NUM - pmc)
* OPROFILE_PMSEL_FIELD_WIDTH)) & ~1ULL;
unit = mmcr1 & (OPROFILE_PM_UNIT_MSK