From 8c2229a7af427341f2d9e92201c3c81fda39fe35 Mon Sep 17 00:00:00 2001
From: Don Zickus <dzickus@redhat.com>
Date: Thu, 24 Mar 2011 23:36:25 +0300
Subject: [PATCH] --- yaml --- r: 242523 b: refs/heads/master c:
 242214f9c1eeaae40eca11e3b4d37bfce960a7cd h: refs/heads/master i:   242521:
 ed67a550fd67d11fc279068ed4f149a50941c392   242519:
 e7e731f312be1e0cfa77703f7f84c0df09f6c102 v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/x86/kernel/cpu/perf_event_p4.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 98121cb1e2a1..b0f84bb64acd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60e4b10c5a27182bc8ce7435050a17cb61c94d00
+refs/heads/master: 242214f9c1eeaae40eca11e3b4d37bfce960a7cd
diff --git a/trunk/arch/x86/kernel/cpu/perf_event_p4.c b/trunk/arch/x86/kernel/cpu/perf_event_p4.c
index 3769ac822f96..d3d7b59841e5 100644
--- a/trunk/arch/x86/kernel/cpu/perf_event_p4.c
+++ b/trunk/arch/x86/kernel/cpu/perf_event_p4.c
@@ -777,6 +777,7 @@ static inline int p4_pmu_clear_cccr_ovf(struct hw_perf_event *hwc)
 	 * the counter has reached zero value and continued counting before
 	 * real NMI signal was received:
 	 */
+	rdmsrl(hwc->event_base, v);
 	if (!(v & ARCH_P4_UNFLAGGED_BIT))
 		return 1;