diff options
| -rw-r--r-- | arch/x86/kernel/cpu/perf_event.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c index 7bd359a57839..7e181a5097ea 100644 --- a/arch/x86/kernel/cpu/perf_event.c +++ b/arch/x86/kernel/cpu/perf_event.c | |||
| @@ -1232,7 +1232,7 @@ static int x86_schedule_events(struct cpu_hw_events *cpuc, int n, int *assign) | |||
| 1232 | int i, j , w, num; | 1232 | int i, j , w, num; |
| 1233 | int weight, wmax; | 1233 | int weight, wmax; |
| 1234 | unsigned long *c; | 1234 | unsigned long *c; |
| 1235 | u64 constraints[X86_PMC_IDX_MAX][BITS_TO_LONGS(X86_PMC_IDX_MAX)]; | 1235 | unsigned long constraints[X86_PMC_IDX_MAX][BITS_TO_LONGS(X86_PMC_IDX_MAX)]; |
| 1236 | unsigned long used_mask[BITS_TO_LONGS(X86_PMC_IDX_MAX)]; | 1236 | unsigned long used_mask[BITS_TO_LONGS(X86_PMC_IDX_MAX)]; |
| 1237 | struct hw_perf_event *hwc; | 1237 | struct hw_perf_event *hwc; |
| 1238 | 1238 | ||
| @@ -1249,7 +1249,7 @@ static int x86_schedule_events(struct cpu_hw_events *cpuc, int n, int *assign) | |||
| 1249 | */ | 1249 | */ |
| 1250 | for (i = 0, num = n; i < n; i++, num--) { | 1250 | for (i = 0, num = n; i < n; i++, num--) { |
| 1251 | hwc = &cpuc->event_list[i]->hw; | 1251 | hwc = &cpuc->event_list[i]->hw; |
| 1252 | c = (unsigned long *)constraints[i]; | 1252 | c = constraints[i]; |
| 1253 | 1253 | ||
| 1254 | /* never assigned */ | 1254 | /* never assigned */ |
| 1255 | if (hwc->idx == -1) | 1255 | if (hwc->idx == -1) |
| @@ -1306,7 +1306,7 @@ static int x86_schedule_events(struct cpu_hw_events *cpuc, int n, int *assign) | |||
| 1306 | for (w = 1, num = n; num && w <= wmax; w++) { | 1306 | for (w = 1, num = n; num && w <= wmax; w++) { |
| 1307 | /* for each event */ | 1307 | /* for each event */ |
| 1308 | for (i = 0; num && i < n; i++) { | 1308 | for (i = 0; num && i < n; i++) { |
| 1309 | c = (unsigned long *)constraints[i]; | 1309 | c = constraints[i]; |
| 1310 | hwc = &cpuc->event_list[i]->hw; | 1310 | hwc = &cpuc->event_list[i]->hw; |
| 1311 | 1311 | ||
| 1312 | weight = bitmap_weight(c, X86_PMC_IDX_MAX); | 1312 | weight = bitmap_weight(c, X86_PMC_IDX_MAX); |