From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Wed, 11 May 2016 13:10:59 +0000 (-0400)
Subject: Revert "xen/events: Mask a moving irq"
X-Git-Tag: v4.1.12-92~158^2~12
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3501f3a7718d2abb2e635076238690679f38d1a7;p=users%2Fjedix%2Flinux-maple.git

Revert "xen/events: Mask a moving irq"

This reverts commit f01077a059d5a39e4eed4095a332ceb028a16fb0.

Requested by Boris. It causes an regression upstream. Awaiting a fix.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---

diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c
index 7682c240b074d..00dd923c12201 100644
--- a/drivers/xen/events/events_base.c
+++ b/drivers/xen/events/events_base.c
@@ -483,19 +483,9 @@ static void eoi_pirq(struct irq_data *data)
 	struct physdev_eoi eoi = { .irq = pirq_from_irq(data->irq) };
 	int rc = 0;
 
-	if (!VALID_EVTCHN(evtchn))
-		return;
+	irq_move_irq(data);
 
-	if (unlikely(irqd_is_setaffinity_pending(data))) {
-		int masked = test_and_set_mask(evtchn);
-
-		clear_evtchn(evtchn);
-
-		irq_move_masked_irq(data);
-
-		if (!masked)
-			unmask_evtchn(evtchn);
-	} else
+	if (VALID_EVTCHN(evtchn))
 		clear_evtchn(evtchn);
 
 	if (pirq_needs_eoi(data->irq)) {
@@ -1366,19 +1356,9 @@ static void ack_dynirq(struct irq_data *data)
 {
 	int evtchn = evtchn_from_irq(data->irq);
 
-	if (!VALID_EVTCHN(evtchn))
-		return;
+	irq_move_irq(data);
 
-	if (unlikely(irqd_is_setaffinity_pending(data))) {
-		int masked = test_and_set_mask(evtchn);
-
-		clear_evtchn(evtchn);
-
-		irq_move_masked_irq(data);
-
-		if (!masked)
-			unmask_evtchn(evtchn);
-	} else
+	if (VALID_EVTCHN(evtchn))
 		clear_evtchn(evtchn);
 }