diff options
Diffstat (limited to 'arch/sparc/kernel')
| -rw-r--r-- | arch/sparc/kernel/perf_event.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/sparc/kernel/perf_event.c b/arch/sparc/kernel/perf_event.c index 0ec92c8861dd..beeb92fa3acd 100644 --- a/arch/sparc/kernel/perf_event.c +++ b/arch/sparc/kernel/perf_event.c | |||
| @@ -1005,7 +1005,7 @@ static int sparc_pmu_enable(struct perf_event *event) | |||
| 1005 | * skip the schedulability test here, it will be peformed | 1005 | * skip the schedulability test here, it will be peformed |
| 1006 | * at commit time(->commit_txn) as a whole | 1006 | * at commit time(->commit_txn) as a whole |
| 1007 | */ | 1007 | */ |
| 1008 | if (cpuc->group_flag & PERF_EVENT_TXN_STARTED) | 1008 | if (cpuc->group_flag & PERF_EVENT_TXN) |
| 1009 | goto nocheck; | 1009 | goto nocheck; |
| 1010 | 1010 | ||
| 1011 | if (check_excludes(cpuc->event, n0, 1)) | 1011 | if (check_excludes(cpuc->event, n0, 1)) |
| @@ -1102,7 +1102,7 @@ static void sparc_pmu_start_txn(const struct pmu *pmu) | |||
| 1102 | { | 1102 | { |
| 1103 | struct cpu_hw_events *cpuhw = &__get_cpu_var(cpu_hw_events); | 1103 | struct cpu_hw_events *cpuhw = &__get_cpu_var(cpu_hw_events); |
| 1104 | 1104 | ||
| 1105 | cpuhw->group_flag |= PERF_EVENT_TXN_STARTED; | 1105 | cpuhw->group_flag |= PERF_EVENT_TXN; |
| 1106 | } | 1106 | } |
| 1107 | 1107 | ||
| 1108 | /* | 1108 | /* |
| @@ -1114,7 +1114,7 @@ static void sparc_pmu_cancel_txn(const struct pmu *pmu) | |||
| 1114 | { | 1114 | { |
| 1115 | struct cpu_hw_events *cpuhw = &__get_cpu_var(cpu_hw_events); | 1115 | struct cpu_hw_events *cpuhw = &__get_cpu_var(cpu_hw_events); |
| 1116 | 1116 | ||
| 1117 | cpuhw->group_flag &= ~PERF_EVENT_TXN_STARTED; | 1117 | cpuhw->group_flag &= ~PERF_EVENT_TXN; |
| 1118 | } | 1118 | } |
| 1119 | 1119 | ||
| 1120 | /* | 1120 | /* |
| @@ -1137,6 +1137,7 @@ static int sparc_pmu_commit_txn(const struct pmu *pmu) | |||
| 1137 | if (sparc_check_constraints(cpuc->event, cpuc->events, n)) | 1137 | if (sparc_check_constraints(cpuc->event, cpuc->events, n)) |
| 1138 | return -EAGAIN; | 1138 | return -EAGAIN; |
| 1139 | 1139 | ||
| 1140 | cpuc->group_flag &= ~PERF_EVENT_TXN; | ||
| 1140 | return 0; | 1141 | return 0; |
| 1141 | } | 1142 | } |
| 1142 | 1143 | ||
