[Xen-devel] [RFC PATCH V5 05/14] xen: introduce test_and_set_mask

[Wei Liu <wei.liu2@xxxxxxxxxx>]

Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx>
---
 drivers/xen/events.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index 38e30aa..eca6488 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -369,6 +369,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
@@ -1506,7 +1512,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);
@@ -1555,7 +1561,7 @@ static int retrigger_dynirq(struct irq_data *data)
        if (VALID_EVTCHN(evtchn)) {
                int masked;
 
-               masked = sync_test_and_set_bit(evtchn, BM(sh->evtchn_mask));
+               masked = test_and_set_mask(evtchn);
                sync_set_bit(evtchn, BM(sh->evtchn_pending));
                if (!masked)
                        unmask_evtchn(evtchn);
-- 
1.7.10.4


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel