[PATCH] Powerpc/oprofile: Fix error in oprofile power7_marked_instr_event() function

[Carl E. L. <ce...@li...>]

Ben:

Please review the following patch.  If it is acceptable, will you please
commit it to the mainline tree.  Thanks.

              Carl Love

--------------------------------------------------------------------------
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 should be to shift left by (max_cntrs - cntr) times
the width of the pmsel field.  However, the #define OPROFILE_MAX_PMC_NUM
was used instead of OPROFILE_PMSEL_FIELD_WIDTH. The result is the left shift
amount is (max_cntrs - cntr) * 3 not (max_cntrs - cntr) * 4.   This patch 
fixes the calculation.

Signed-off-by: Carl Love <ce...@us...>
---
 arch/powerpc/oprofile/op_model_power4.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/powerpc/oprofile/op_model_power4.c b/arch/powerpc/oprofile/op_model_power4.c
index 315f949..f444b94 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
-- 
1.7.12.rc1.22.gbfbf4d4