diff options
| -rw-r--r-- | arch/x86/events/intel/uncore.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/events/intel/uncore.c b/arch/x86/events/intel/uncore.c index efca2685d876..dbaaf7dc8373 100644 --- a/arch/x86/events/intel/uncore.c +++ b/arch/x86/events/intel/uncore.c | |||
| @@ -319,9 +319,9 @@ static struct intel_uncore_box *uncore_alloc_box(struct intel_uncore_type *type, | |||
| 319 | */ | 319 | */ |
| 320 | static int uncore_pmu_event_init(struct perf_event *event); | 320 | static int uncore_pmu_event_init(struct perf_event *event); |
| 321 | 321 | ||
| 322 | static bool is_uncore_event(struct perf_event *event) | 322 | static bool is_box_event(struct intel_uncore_box *box, struct perf_event *event) |
| 323 | { | 323 | { |
| 324 | return event->pmu->event_init == uncore_pmu_event_init; | 324 | return &box->pmu->pmu == event->pmu; |
| 325 | } | 325 | } |
| 326 | 326 | ||
| 327 | static int | 327 | static int |
| @@ -340,7 +340,7 @@ uncore_collect_events(struct intel_uncore_box *box, struct perf_event *leader, | |||
| 340 | 340 | ||
| 341 | n = box->n_events; | 341 | n = box->n_events; |
| 342 | 342 | ||
| 343 | if (is_uncore_event(leader)) { | 343 | if (is_box_event(box, leader)) { |
| 344 | box->event_list[n] = leader; | 344 | box->event_list[n] = leader; |
| 345 | n++; | 345 | n++; |
| 346 | } | 346 | } |
| @@ -349,7 +349,7 @@ uncore_collect_events(struct intel_uncore_box *box, struct perf_event *leader, | |||
| 349 | return n; | 349 | return n; |
| 350 | 350 | ||
| 351 | list_for_each_entry(event, &leader->sibling_list, group_entry) { | 351 | list_for_each_entry(event, &leader->sibling_list, group_entry) { |
| 352 | if (!is_uncore_event(event) || | 352 | if (!is_box_event(box, event) || |
| 353 | event->state <= PERF_EVENT_STATE_OFF) | 353 | event->state <= PERF_EVENT_STATE_OFF) |
| 354 | continue; | 354 | continue; |
| 355 | 355 | ||
