diff options
Diffstat (limited to 'arch/sparc/kernel/perf_event.c')
-rw-r--r-- | arch/sparc/kernel/perf_event.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/sparc/kernel/perf_event.c b/arch/sparc/kernel/perf_event.c index 4bc402938575..481b894a5018 100644 --- a/arch/sparc/kernel/perf_event.c +++ b/arch/sparc/kernel/perf_event.c | |||
@@ -1099,7 +1099,7 @@ static int __hw_perf_event_init(struct perf_event *event) | |||
1099 | * Set the flag to make pmu::enable() not perform the | 1099 | * Set the flag to make pmu::enable() not perform the |
1100 | * schedulability test, it will be performed at commit time | 1100 | * schedulability test, it will be performed at commit time |
1101 | */ | 1101 | */ |
1102 | static void sparc_pmu_start_txn(const struct pmu *pmu) | 1102 | static void sparc_pmu_start_txn(struct pmu *pmu) |
1103 | { | 1103 | { |
1104 | struct cpu_hw_events *cpuhw = &__get_cpu_var(cpu_hw_events); | 1104 | struct cpu_hw_events *cpuhw = &__get_cpu_var(cpu_hw_events); |
1105 | 1105 | ||
@@ -1111,7 +1111,7 @@ static void sparc_pmu_start_txn(const struct pmu *pmu) | |||
1111 | * Clear the flag and pmu::enable() will perform the | 1111 | * Clear the flag and pmu::enable() will perform the |
1112 | * schedulability test. | 1112 | * schedulability test. |
1113 | */ | 1113 | */ |
1114 | static void sparc_pmu_cancel_txn(const struct pmu *pmu) | 1114 | static void sparc_pmu_cancel_txn(struct pmu *pmu) |
1115 | { | 1115 | { |
1116 | struct cpu_hw_events *cpuhw = &__get_cpu_var(cpu_hw_events); | 1116 | struct cpu_hw_events *cpuhw = &__get_cpu_var(cpu_hw_events); |
1117 | 1117 | ||
@@ -1123,7 +1123,7 @@ static void sparc_pmu_cancel_txn(const struct pmu *pmu) | |||
1123 | * Perform the group schedulability test as a whole | 1123 | * Perform the group schedulability test as a whole |
1124 | * Return 0 if success | 1124 | * Return 0 if success |
1125 | */ | 1125 | */ |
1126 | static int sparc_pmu_commit_txn(const struct pmu *pmu) | 1126 | static int sparc_pmu_commit_txn(struct pmu *pmu) |
1127 | { | 1127 | { |
1128 | struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events); | 1128 | struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events); |
1129 | int n; | 1129 | int n; |
@@ -1142,7 +1142,7 @@ static int sparc_pmu_commit_txn(const struct pmu *pmu) | |||
1142 | return 0; | 1142 | return 0; |
1143 | } | 1143 | } |
1144 | 1144 | ||
1145 | static const struct pmu pmu = { | 1145 | static struct pmu pmu = { |
1146 | .enable = sparc_pmu_enable, | 1146 | .enable = sparc_pmu_enable, |
1147 | .disable = sparc_pmu_disable, | 1147 | .disable = sparc_pmu_disable, |
1148 | .read = sparc_pmu_read, | 1148 | .read = sparc_pmu_read, |
@@ -1152,7 +1152,7 @@ static const struct pmu pmu = { | |||
1152 | .commit_txn = sparc_pmu_commit_txn, | 1152 | .commit_txn = sparc_pmu_commit_txn, |
1153 | }; | 1153 | }; |
1154 | 1154 | ||
1155 | const struct pmu *hw_perf_event_init(struct perf_event *event) | 1155 | struct pmu *hw_perf_event_init(struct perf_event *event) |
1156 | { | 1156 | { |
1157 | int err = __hw_perf_event_init(event); | 1157 | int err = __hw_perf_event_init(event); |
1158 | 1158 | ||