diff options
| author | Wei Liu <wei.liu2@citrix.com> | 2013-03-07 15:50:27 +0000 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2016-04-20 08:46:46 +0200 |
| commit | a3e63f3aff2762aa9ee0d6e0101584ca39abc9c7 (patch) | |
| tree | fe459b72957d17a619ae5f02bdd5085fdb52ec3a /drivers/xen | |
| parent | a668a8394cc07e3e65f07a2039d38663cee83d1e (diff) | |
| download | lwn-a3e63f3aff2762aa9ee0d6e0101584ca39abc9c7.tar.gz lwn-a3e63f3aff2762aa9ee0d6e0101584ca39abc9c7.zip | |
xen/events: introduce test_and_set_mask()
commit 3f70fa828249e3f37883be98f5b4d08e947f55b0 upstream.
In preparation for adding event channel port ops, add
test_and_set_mask().
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'drivers/xen')
| -rw-r--r-- | drivers/xen/events.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/xen/events.c b/drivers/xen/events.c index 767fe735abd7..bd12a6660fe3 100644 --- a/drivers/xen/events.c +++ b/drivers/xen/events.c @@ -370,6 +370,12 @@ static inline int test_evtchn(int port) return sync_test_bit(port, BM(&s->evtchn_pending[0])); } +static inline int test_and_set_mask(int port) +{ + struct shared_info *s = HYPERVISOR_shared_info; + return sync_test_and_set_bit(port, BM(&s->evtchn_mask[0])); +} + /** * notify_remote_via_irq - send event to remote end of event channel via irq @@ -1515,7 +1521,6 @@ void rebind_evtchn_irq(int evtchn, int irq) /* Rebind an evtchn so that it gets delivered to a specific cpu */ static int rebind_irq_to_cpu(unsigned irq, unsigned tcpu) { - struct shared_info *s = HYPERVISOR_shared_info; struct evtchn_bind_vcpu bind_vcpu; int evtchn = evtchn_from_irq(irq); int masked; @@ -1538,7 +1543,7 @@ static int rebind_irq_to_cpu(unsigned irq, unsigned tcpu) * Mask the event while changing the VCPU binding to prevent * it being delivered on an unexpected VCPU. */ - masked = sync_test_and_set_bit(evtchn, BM(s->evtchn_mask)); + masked = test_and_set_mask(evtchn); /* * If this fails, it usually just indicates that we're dealing with a @@ -1570,7 +1575,7 @@ int resend_irq_on_evtchn(unsigned int irq) if (!VALID_EVTCHN(evtchn)) return 1; - masked = sync_test_and_set_bit(evtchn, BM(s->evtchn_mask)); + masked = test_and_set_mask(evtchn); sync_set_bit(evtchn, BM(s->evtchn_pending)); if (!masked) unmask_evtchn(evtchn); |