From: Robert Richter <robert.richter@amd.com>
Date: Tue, 22 Jul 2008 19:09:04 +0000 (+0200)
Subject: x86/oprofile: op_model_athlon.c: fix counter reset when reenabling IBS OP
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=543a157bbdfae8eb997506031c3b2d4d17957098;p=deliverable%2Flinux.git

x86/oprofile: op_model_athlon.c: fix counter reset when reenabling IBS OP

Signed-off-by: Robert Richter <robert.richter@amd.com>
Cc: oprofile-list <oprofile-list@lists.sourceforge.net>
Cc: Barry Kasindorf <barry.kasindorf@amd.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/arch/x86/oprofile/op_model_athlon.c b/arch/x86/oprofile/op_model_athlon.c
index a3a2058c372c..9c8c8c583132 100644
--- a/arch/x86/oprofile/op_model_athlon.c
+++ b/arch/x86/oprofile/op_model_athlon.c
@@ -251,6 +251,7 @@ op_amd_handle_ibs(struct pt_regs * const regs,
 						(unsigned int *)&ibs_op,
 						IBS_OP_BEGIN);
 			rdmsr(MSR_AMD64_IBSOPCTL, low, high);
+			high = 0;
 			low &= ~IBS_OP_LOW_VALID_BIT;
 			low |= IBS_OP_LOW_ENABLE;
 			wrmsr(MSR_AMD64_IBSOPCTL, low, high);