From b3ad317b1dc1967a3bffb30b63313f93dff9fea0 Mon Sep 17 00:00:00 2001
From: Will Deacon <will.deacon@arm.com>
Date: Sat, 28 Jul 2012 16:44:38 +0100
Subject: [PATCH] --- yaml --- r: 326430 b: refs/heads/master c:
 9f44f9a234020947dd16500a203c9580a66ed67d h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/arch/arm/kernel/perf_event.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b233951bf4e2..9378f09af539 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df3d17e068bf69e3c5a53d52d30caad3d061b762
+refs/heads/master: 9f44f9a234020947dd16500a203c9580a66ed67d
diff --git a/trunk/arch/arm/kernel/perf_event.c b/trunk/arch/arm/kernel/perf_event.c
index 1ac1531dcfef..22ed5120a6ed 100644
--- a/trunk/arch/arm/kernel/perf_event.c
+++ b/trunk/arch/arm/kernel/perf_event.c
@@ -223,7 +223,6 @@ armpmu_stop(struct perf_event *event, int flags)
 	 */
 	if (!(hwc->state & PERF_HES_STOPPED)) {
 		armpmu->disable(hwc, hwc->idx);
-		barrier(); /* why? */
 		armpmu_event_update(event, hwc, hwc->idx);
 		hwc->state |= PERF_HES_STOPPED | PERF_HES_UPTODATE;
 	}