diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/kernel/cpu/perf_event.c | 2 | ||||
-rw-r--r-- | arch/x86/kernel/cpu/perf_event_intel.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c index 641ccb9dddbc..b1fbdeecf6c9 100644 --- a/arch/x86/kernel/cpu/perf_event.c +++ b/arch/x86/kernel/cpu/perf_event.c | |||
@@ -676,7 +676,7 @@ static int x86_schedule_events(struct cpu_hw_events *cpuc, int n, int *assign) | |||
676 | if (c->weight != w) | 676 | if (c->weight != w) |
677 | continue; | 677 | continue; |
678 | 678 | ||
679 | for_each_bit(j, c->idxmsk, X86_PMC_IDX_MAX) { | 679 | for_each_set_bit(j, c->idxmsk, X86_PMC_IDX_MAX) { |
680 | if (!test_bit(j, used_mask)) | 680 | if (!test_bit(j, used_mask)) |
681 | break; | 681 | break; |
682 | } | 682 | } |
diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c index cf6590cf4a5f..977e7544738c 100644 --- a/arch/x86/kernel/cpu/perf_event_intel.c +++ b/arch/x86/kernel/cpu/perf_event_intel.c | |||
@@ -757,7 +757,7 @@ again: | |||
757 | 757 | ||
758 | inc_irq_stat(apic_perf_irqs); | 758 | inc_irq_stat(apic_perf_irqs); |
759 | ack = status; | 759 | ack = status; |
760 | for_each_bit(bit, (unsigned long *)&status, X86_PMC_IDX_MAX) { | 760 | for_each_set_bit(bit, (unsigned long *)&status, X86_PMC_IDX_MAX) { |
761 | struct perf_event *event = cpuc->events[bit]; | 761 | struct perf_event *event = cpuc->events[bit]; |
762 | 762 | ||
763 | clear_bit(bit, (unsigned long *) &status); | 763 | clear_bit(bit, (unsigned long *) &status); |