diff options
Diffstat (limited to 'arch/powerpc/kernel')
-rw-r--r-- | arch/powerpc/kernel/perf_counter.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/perf_counter.c b/arch/powerpc/kernel/perf_counter.c index 5008762e8bf4..26f69dc7130e 100644 --- a/arch/powerpc/kernel/perf_counter.c +++ b/arch/powerpc/kernel/perf_counter.c | |||
@@ -602,7 +602,7 @@ hw_perf_counter_init(struct perf_counter *counter) | |||
602 | return NULL; | 602 | return NULL; |
603 | if ((s64)counter->hw_event.irq_period < 0) | 603 | if ((s64)counter->hw_event.irq_period < 0) |
604 | return NULL; | 604 | return NULL; |
605 | ev = counter->hw_event.type; | 605 | ev = counter->hw_event.event_id; |
606 | if (!counter->hw_event.raw) { | 606 | if (!counter->hw_event.raw) { |
607 | if (ev >= ppmu->n_generic || | 607 | if (ev >= ppmu->n_generic || |
608 | ppmu->generic_events[ev] == 0) | 608 | ppmu->generic_events[ev] == 0) |
@@ -692,7 +692,7 @@ static void perf_handle_group(struct perf_counter *counter) | |||
692 | list_for_each_entry(sub, &leader->sibling_list, list_entry) { | 692 | list_for_each_entry(sub, &leader->sibling_list, list_entry) { |
693 | if (sub != counter) | 693 | if (sub != counter) |
694 | sub->hw_ops->read(sub); | 694 | sub->hw_ops->read(sub); |
695 | perf_store_irq_data(counter, sub->hw_event.type); | 695 | perf_store_irq_data(counter, sub->hw_event.event_config); |
696 | perf_store_irq_data(counter, atomic64_read(&sub->count)); | 696 | perf_store_irq_data(counter, atomic64_read(&sub->count)); |
697 | } | 697 | } |
698 | } | 698 | } |