aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/perf_event.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/powerpc/kernel/perf_event.c')
-rw-r--r--arch/powerpc/kernel/perf_event.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/perf_event.c b/arch/powerpc/kernel/perf_event.c
index 43b83c35cf54..ac2a8c2554d9 100644
--- a/arch/powerpc/kernel/perf_event.c
+++ b/arch/powerpc/kernel/perf_event.c
@@ -754,7 +754,7 @@ static int power_pmu_enable(struct perf_event *event)
754 * skip the schedulability test here, it will be peformed 754 * skip the schedulability test here, it will be peformed
755 * at commit time(->commit_txn) as a whole 755 * at commit time(->commit_txn) as a whole
756 */ 756 */
757 if (cpuhw->group_flag & PERF_EVENT_TXN_STARTED) 757 if (cpuhw->group_flag & PERF_EVENT_TXN)
758 goto nocheck; 758 goto nocheck;
759 759
760 if (check_excludes(cpuhw->event, cpuhw->flags, n0, 1)) 760 if (check_excludes(cpuhw->event, cpuhw->flags, n0, 1))
@@ -858,7 +858,7 @@ void power_pmu_start_txn(const struct pmu *pmu)
858{ 858{
859 struct cpu_hw_events *cpuhw = &__get_cpu_var(cpu_hw_events); 859 struct cpu_hw_events *cpuhw = &__get_cpu_var(cpu_hw_events);
860 860
861 cpuhw->group_flag |= PERF_EVENT_TXN_STARTED; 861 cpuhw->group_flag |= PERF_EVENT_TXN;
862 cpuhw->n_txn_start = cpuhw->n_events; 862 cpuhw->n_txn_start = cpuhw->n_events;
863} 863}
864 864
@@ -871,7 +871,7 @@ void power_pmu_cancel_txn(const struct pmu *pmu)
871{ 871{
872 struct cpu_hw_events *cpuhw = &__get_cpu_var(cpu_hw_events); 872 struct cpu_hw_events *cpuhw = &__get_cpu_var(cpu_hw_events);
873 873
874 cpuhw->group_flag &= ~PERF_EVENT_TXN_STARTED; 874 cpuhw->group_flag &= ~PERF_EVENT_TXN;
875} 875}
876 876
877/* 877/*
@@ -897,6 +897,7 @@ int power_pmu_commit_txn(const struct pmu *pmu)
897 for (i = cpuhw->n_txn_start; i < n; ++i) 897 for (i = cpuhw->n_txn_start; i < n; ++i)
898 cpuhw->event[i]->hw.config = cpuhw->events[i]; 898 cpuhw->event[i]->hw.config = cpuhw->events[i];
899 899
900 cpuhw->group_flag &= ~PERF_EVENT_TXN;
900 return 0; 901 return 0;
901} 902}
902 903