diff options
| author | David Ahern <dsahern@gmail.com> | 2015-02-18 12:45:43 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-03-27 04:49:44 -0400 |
| commit | 9332d250b4b4f67c633894b311e022e3cf943bd5 (patch) | |
| tree | 809594b7728f48ab273d834eb763ee5698f846d7 | |
| parent | 936c663aed930972f7e185485fd6c2da69e33819 (diff) | |
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@gmail.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1424281543-67335-1-git-send-email-dsahern@gmail.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
| -rw-r--r-- | arch/x86/kernel/cpu/perf_event.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c index ec6e982fd464..ac41b3ad1fc9 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) | |||
| 1044 | 1044 | ||
| 1045 | hwc = &event->hw; | 1045 | hwc = &event->hw; |
| 1046 | 1046 | ||
| 1047 | perf_pmu_disable(event->pmu); | ||
| 1048 | n0 = cpuc->n_events; | 1047 | n0 = cpuc->n_events; |
| 1049 | ret = n = collect_events(cpuc, event, false); | 1048 | ret = n = collect_events(cpuc, event, false); |
| 1050 | if (ret < 0) | 1049 | if (ret < 0) |
| @@ -1082,7 +1081,6 @@ done_collect: | |||
| 1082 | 1081 | ||
| 1083 | ret = 0; | 1082 | ret = 0; |
| 1084 | out: | 1083 | out: |
| 1085 | perf_pmu_enable(event->pmu); | ||
| 1086 | return ret; | 1084 | return ret; |
| 1087 | } | 1085 | } |
| 1088 | 1086 | ||