Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'xtensa-20200712' of git://github.com/jcmvbkbc/linux-xtensa
Pull Xtensa fixes from Max Filippov:
- fix __sync_fetch_and_{and,or}_4 declarations to avoid build warning
- update *pos in cpuinfo_op.next to avoid runtime warning
- use for_each_set_bit in xtensa_pmu_irq_handler instead of open-coding
it
* tag 'xtensa-20200712' of git://github.com/jcmvbkbc/linux-xtensa:
xtensa: simplify xtensa_pmu_irq_handler
xtensa: update *pos in cpuinfo_op.next
xtensa: fix __sync_fetch_and_{and,or}_4 declarations
+5
-6
+1
-3
arch/xtensa/kernel/perf_event.c
+1
-3
arch/xtensa/kernel/perf_event.c
···
362
362
struct xtensa_pmu_events *ev = this_cpu_ptr(&xtensa_pmu_events);
363
363
unsigned i;
364
364
365
-
for (i = find_first_bit(ev->used_mask, XCHAL_NUM_PERF_COUNTERS);
366
-
i < XCHAL_NUM_PERF_COUNTERS;
367
-
i = find_next_bit(ev->used_mask, XCHAL_NUM_PERF_COUNTERS, i + 1)) {
365
+
for_each_set_bit(i, ev->used_mask, XCHAL_NUM_PERF_COUNTERS) {
368
366
uint32_t v = get_er(XTENSA_PMU_PMSTAT(i));
369
367
struct perf_event *event = ev->event[i];
370
368
struct hw_perf_event *hwc = &event->hw;
+2
-1
arch/xtensa/kernel/setup.c
+2
-1
arch/xtensa/kernel/setup.c
+2
-2
arch/xtensa/kernel/xtensa_ksyms.c
+2
-2
arch/xtensa/kernel/xtensa_ksyms.c
···
87
87
}
88
88
EXPORT_SYMBOL(__xtensa_libgcc_window_spill);
89
89
90
-
unsigned long __sync_fetch_and_and_4(unsigned long *p, unsigned long v)
90
+
unsigned int __sync_fetch_and_and_4(volatile void *p, unsigned int v)
91
91
{
92
92
BUG();
93
93
}
94
94
EXPORT_SYMBOL(__sync_fetch_and_and_4);
95
95
96
-
unsigned long __sync_fetch_and_or_4(unsigned long *p, unsigned long v)
96
+
unsigned int __sync_fetch_and_or_4(volatile void *p, unsigned int v)
97
97
{
98
98
BUG();
99
99
}