Revert "xen/events/fifo: Handle linked events when closing a port"
This reverts commit fcdf31a7c1
.
This was causing a WARNING whenever a PIRQ was closed since
shutdown_pirq() is called with irqs disabled.
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
Cc: <stable@vger.kernel.org>
This commit is contained in:
@@ -452,12 +452,10 @@ static void xen_free_irq(unsigned irq)
|
||||
irq_free_desc(irq);
|
||||
}
|
||||
|
||||
static void xen_evtchn_close(unsigned int port, unsigned int cpu)
|
||||
static void xen_evtchn_close(unsigned int port)
|
||||
{
|
||||
struct evtchn_close close;
|
||||
|
||||
xen_evtchn_op_close(port, cpu);
|
||||
|
||||
close.port = port;
|
||||
if (HYPERVISOR_event_channel_op(EVTCHNOP_close, &close) != 0)
|
||||
BUG();
|
||||
@@ -546,7 +544,7 @@ out:
|
||||
|
||||
err:
|
||||
pr_err("irq%d: Failed to set port to irq mapping (%d)\n", irq, rc);
|
||||
xen_evtchn_close(evtchn, NR_CPUS);
|
||||
xen_evtchn_close(evtchn);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -567,7 +565,7 @@ static void shutdown_pirq(struct irq_data *data)
|
||||
return;
|
||||
|
||||
mask_evtchn(evtchn);
|
||||
xen_evtchn_close(evtchn, cpu_from_evtchn(evtchn));
|
||||
xen_evtchn_close(evtchn);
|
||||
xen_irq_info_cleanup(info);
|
||||
}
|
||||
|
||||
@@ -611,7 +609,7 @@ static void __unbind_from_irq(unsigned int irq)
|
||||
if (VALID_EVTCHN(evtchn)) {
|
||||
unsigned int cpu = cpu_from_irq(irq);
|
||||
|
||||
xen_evtchn_close(evtchn, cpu);
|
||||
xen_evtchn_close(evtchn);
|
||||
|
||||
switch (type_from_irq(irq)) {
|
||||
case IRQT_VIRQ:
|
||||
|
Reference in New Issue
Block a user