---

yaml --- r: 147380 b: refs/heads/master c: 527e26a h: refs/heads/master v: v3
git-mirror · Apr 29, 2009 · 29ffd69 · 29ffd69
1 parent 00be2a4
commit 29ffd69
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4295ee62660b13ddb87d41539f49b239e6e7d56f
+refs/heads/master: 527e26af3741a2168986d8b82653ffe173891324
diff --git a/trunk/arch/x86/kernel/cpu/perf_counter.c b/trunk/arch/x86/kernel/cpu/perf_counter.c
@@ -673,7 +673,7 @@ static int pmc_generic_enable(struct perf_counter *counter)
 	/*
 	 * Make it visible before enabling the hw:
 	 */
-	smp_wmb();
+	barrier();
 
 	__hw_perf_counter_set_period(counter, hwc, idx);
 	__pmc_generic_enable(counter, hwc, idx);
@@ -745,7 +745,7 @@ static void pmc_generic_disable(struct perf_counter *counter)
 	 * Make sure the cleared pointer becomes visible before we
 	 * (potentially) free the counter:
 	 */
-	smp_wmb();
+	barrier();
 
 	/*
 	 * Drain the remaining delta count out of a counter