From 68bdf749d16e9c0b4a041be229441e5c46693c3f Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Fri, 13 Mar 2009 12:21:30 +0100
Subject: [PATCH] --- yaml --- r: 147249 b: refs/heads/master c:
 60b3df9c1e24a18aabb412da9905208c5f04ebea h: refs/heads/master i:   147247:
 950a40faab9a81a85c8d1a443536df138ad7cba7 v: v3

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

diff --git a/[refs] b/[refs]
index e8d7b354ce60..ee14bfbd6095 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 755642322aa66fbc5421a35fd3e1733f73e20083
+refs/heads/master: 60b3df9c1e24a18aabb412da9905208c5f04ebea
diff --git a/trunk/arch/x86/kernel/cpu/perf_counter.c b/trunk/arch/x86/kernel/cpu/perf_counter.c
index 1cedc3468ce5..a2e3b76bfdc1 100644
--- a/trunk/arch/x86/kernel/cpu/perf_counter.c
+++ b/trunk/arch/x86/kernel/cpu/perf_counter.c
@@ -247,6 +247,10 @@ static u64 pmc_amd_save_disable_all(void)
 
 	enabled = cpuc->enabled;
 	cpuc->enabled = 0;
+	/*
+	 * ensure we write the disable before we start disabling the
+	 * counters proper, so that pcm_amd_enable() does the right thing.
+	 */
 	barrier();
 
 	for (idx = 0; idx < nr_counters_generic; idx++) {