[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-9332d250b4b4f67c633894b311e022e3cf943bd5@git.kernel.org>
Date: Fri, 27 Mar 2015 04:46:06 -0700
From: tip-bot for David Ahern <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: hpa@...or.com, linux-kernel@...r.kernel.org, tglx@...utronix.de,
dsahern@...il.com, mingo@...nel.org, peterz@...radead.org
Subject: [tip:perf/core] perf/x86:
Remove redundant calls to perf_pmu_{dis|en}able()
Commit-ID: 9332d250b4b4f67c633894b311e022e3cf943bd5
Gitweb: http://git.kernel.org/tip/9332d250b4b4f67c633894b311e022e3cf943bd5
Author: David Ahern <dsahern@...il.com>
AuthorDate: Wed, 18 Feb 2015 10:45:43 -0700
Committer: Ingo Molnar <mingo@...nel.org>
CommitDate: Fri, 27 Mar 2015 09:49:44 +0100
perf/x86: Remove redundant calls to perf_pmu_{dis|en}able()
perf_pmu_disable() is called before pmu->add() and perf_pmu_enable() is called
afterwards. No need to call these inside of x86_pmu_add() as well.
Signed-off-by: David Ahern <dsahern@...il.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@...radead.org>
Link: http://lkml.kernel.org/r/1424281543-67335-1-git-send-email-dsahern@gmail.com
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
arch/x86/kernel/cpu/perf_event.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
index ec6e982..ac41b3a 100644
--- a/arch/x86/kernel/cpu/perf_event.c
+++ b/arch/x86/kernel/cpu/perf_event.c
@@ -1044,7 +1044,6 @@ static int x86_pmu_add(struct perf_event *event, int flags)
hwc = &event->hw;
- perf_pmu_disable(event->pmu);
n0 = cpuc->n_events;
ret = n = collect_events(cpuc, event, false);
if (ret < 0)
@@ -1082,7 +1081,6 @@ done_collect:
ret = 0;
out:
- perf_pmu_enable(event->pmu);
return ret;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists