hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/drivers/xen/events/events_2l.c
....@@ -52,37 +52,38 @@
5252 clear_bit(evtchn, BM(per_cpu(cpu_evtchn_mask, cpu)));
5353 }
5454
55
-static void evtchn_2l_bind_to_cpu(struct irq_info *info, unsigned cpu)
55
+static void evtchn_2l_bind_to_cpu(evtchn_port_t evtchn, unsigned int cpu,
56
+ unsigned int old_cpu)
5657 {
57
- clear_bit(info->evtchn, BM(per_cpu(cpu_evtchn_mask, info->cpu)));
58
- set_bit(info->evtchn, BM(per_cpu(cpu_evtchn_mask, cpu)));
58
+ clear_bit(evtchn, BM(per_cpu(cpu_evtchn_mask, old_cpu)));
59
+ set_bit(evtchn, BM(per_cpu(cpu_evtchn_mask, cpu)));
5960 }
6061
61
-static void evtchn_2l_clear_pending(unsigned port)
62
+static void evtchn_2l_clear_pending(evtchn_port_t port)
6263 {
6364 struct shared_info *s = HYPERVISOR_shared_info;
6465 sync_clear_bit(port, BM(&s->evtchn_pending[0]));
6566 }
6667
67
-static void evtchn_2l_set_pending(unsigned port)
68
+static void evtchn_2l_set_pending(evtchn_port_t port)
6869 {
6970 struct shared_info *s = HYPERVISOR_shared_info;
7071 sync_set_bit(port, BM(&s->evtchn_pending[0]));
7172 }
7273
73
-static bool evtchn_2l_is_pending(unsigned port)
74
+static bool evtchn_2l_is_pending(evtchn_port_t port)
7475 {
7576 struct shared_info *s = HYPERVISOR_shared_info;
7677 return sync_test_bit(port, BM(&s->evtchn_pending[0]));
7778 }
7879
79
-static void evtchn_2l_mask(unsigned port)
80
+static void evtchn_2l_mask(evtchn_port_t port)
8081 {
8182 struct shared_info *s = HYPERVISOR_shared_info;
8283 sync_set_bit(port, BM(&s->evtchn_mask[0]));
8384 }
8485
85
-static void evtchn_2l_unmask(unsigned port)
86
+static void evtchn_2l_unmask(evtchn_port_t port)
8687 {
8788 struct shared_info *s = HYPERVISOR_shared_info;
8889 unsigned int cpu = get_cpu();
....@@ -174,7 +175,7 @@
174175 /* Timer interrupt has highest priority. */
175176 irq = irq_from_virq(cpu, VIRQ_TIMER);
176177 if (irq != -1) {
177
- unsigned int evtchn = evtchn_from_irq(irq);
178
+ evtchn_port_t evtchn = evtchn_from_irq(irq);
178179 word_idx = evtchn / BITS_PER_LONG;
179180 bit_idx = evtchn % BITS_PER_LONG;
180181 if (active_evtchns(cpu, s, word_idx) & (1ULL << bit_idx))
....@@ -229,7 +230,7 @@
229230
230231 do {
231232 xen_ulong_t bits;
232
- int port;
233
+ evtchn_port_t port;
233234
234235 bits = MASK_LSBS(pending_bits, bit_idx);
235236