From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH 05/13] xen: introduce test_and_set_mask Date: Thu, 31 Jan 2013 14:46:59 +0000 Message-ID: <1359643627-29486-6-git-send-email-wei.liu2@citrix.com> References: <1359643627-29486-1-git-send-email-wei.liu2@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1359643627-29486-1-git-send-email-wei.liu2@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: david.vrabel@citrix.com, Wei Liu , ian.campbell@citrix.com, jbeulich@suse.com, konrad.wilk@oracle.com List-Id: xen-devel@lists.xenproject.org Signed-off-by: Wei Liu --- 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 93a3648..0fae3f9 100644 --- a/drivers/xen/events.c +++ b/drivers/xen/events.c @@ -345,6 +345,12 @@ static inline int test_evtchn(int port) return sync_test_bit(port, &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, &s->evtchn_mask[0]); +} + /** * notify_remote_via_irq - send event to remote end of event channel via irq @@ -1464,7 +1470,7 @@ int resend_irq_on_evtchn(unsigned int irq) if (!VALID_EVTCHN(evtchn)) return 1; - masked = sync_test_and_set_bit(evtchn, s->evtchn_mask); + masked = test_and_set_mask(evtchn); sync_set_bit(evtchn, s->evtchn_pending); if (!masked) unmask_evtchn(evtchn); @@ -1513,7 +1519,7 @@ static int retrigger_dynirq(struct irq_data *data) if (VALID_EVTCHN(evtchn)) { int masked; - masked = sync_test_and_set_bit(evtchn, sh->evtchn_mask); + masked = test_and_set_mask(evtchn); sync_set_bit(evtchn, sh->evtchn_pending); if (!masked) unmask_evtchn(evtchn); -- 1.7.10.4