aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2012-07-28 16:44:38 +0100
committerWill Deacon <will.deacon@arm.com>2012-08-23 11:35:51 +0100
commit9f44f9a234020947dd16500a203c9580a66ed67d (patch)
tree857224d88742c07594efbbdf2007b2a4910e5521 /arch/arm/kernel
parentdf3d17e068bf69e3c5a53d52d30caad3d061b762 (diff)
downloadkernel_goldelico_gta04-9f44f9a234020947dd16500a203c9580a66ed67d.zip
kernel_goldelico_gta04-9f44f9a234020947dd16500a203c9580a66ed67d.tar.gz
kernel_goldelico_gta04-9f44f9a234020947dd16500a203c9580a66ed67d.tar.bz2
ARM: perf: remove mysterious compiler barrier
There's a rather strange compiler barrier in the PMU disabling code which was presumably placed there by aliens. There's no valid reason for the barrier and one can only suspect that it's up to no good. This patch removes it before it has a chance to spread. Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm/kernel')
-rw-r--r--arch/arm/kernel/perf_event.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/kernel/perf_event.c b/arch/arm/kernel/perf_event.c
index 1ac1531..22ed512 100644
--- a/arch/arm/kernel/perf_event.c
+++ b/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;
}