diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-05-10 16:06:04 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-05-10 16:06:04 +0200 |
| commit | 2e00fde5c6ed8535244332ebb55e881baa54ae46 (patch) | |
| tree | f578e02ef1dc6e59630f09404bb2f58500876811 /drivers/xen/events/events_base.c | |
| parent | 39f0ccde3624e7cf882faccf7f72a47b7a763bfb (diff) | |
| parent | 3231e2053eaeee70bdfb216a78a30f11e88e2243 (diff) | |
| download | blackbird-op-linux-2e00fde5c6ed8535244332ebb55e881baa54ae46.tar.gz blackbird-op-linux-2e00fde5c6ed8535244332ebb55e881baa54ae46.zip | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'drivers/xen/events/events_base.c')
| -rw-r--r-- | drivers/xen/events/events_base.c | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c index 488017a0806a..cb7138c97c69 100644 --- a/drivers/xen/events/events_base.c +++ b/drivers/xen/events/events_base.c @@ -484,9 +484,19 @@ static void eoi_pirq(struct irq_data *data) struct physdev_eoi eoi = { .irq = pirq_from_irq(data->irq) }; int rc = 0; - irq_move_irq(data); + if (!VALID_EVTCHN(evtchn)) + return; - if (VALID_EVTCHN(evtchn)) + 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 clear_evtchn(evtchn); if (pirq_needs_eoi(data->irq)) { @@ -1357,9 +1367,19 @@ static void ack_dynirq(struct irq_data *data) { int evtchn = evtchn_from_irq(data->irq); - irq_move_irq(data); + if (!VALID_EVTCHN(evtchn)) + return; - if (VALID_EVTCHN(evtchn)) + 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 clear_evtchn(evtchn); } |
