[Xen-changelog] [xen-unstable] [LINUX] Remove the only use of evtchn_upcall_mask in common code.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID ea4829e3009209a62e1f3efbcd632cb40956f42c
# Parent  b8e8b6aad8c8c38d8277c5188e548c64049299f0
[LINUX] Remove the only use of evtchn_upcall_mask in common code.
Replace with an assertion of irq_disabled().
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
 linux-2.6-xen-sparse/drivers/xen/core/evtchn.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff -r b8e8b6aad8c8 -r ea4829e30092 
linux-2.6-xen-sparse/drivers/xen/core/evtchn.c
--- a/linux-2.6-xen-sparse/drivers/xen/core/evtchn.c    Fri Jun 09 17:05:09 
2006 +0100
+++ b/linux-2.6-xen-sparse/drivers/xen/core/evtchn.c    Sat Jun 10 11:05:11 
2006 +0100
@@ -717,6 +717,8 @@ void unmask_evtchn(int port)
        unsigned int cpu = smp_processor_id();
        vcpu_info_t *vcpu_info = &s->vcpu_info[cpu];
 
+       BUG_ON(!irqs_disabled());
+
        /* Slow path (hypercall) if this is a non-local port. */
        if (unlikely(cpu != cpu_from_evtchn(port))) {
                struct evtchn_unmask unmask = { .port = port };
@@ -733,11 +735,8 @@ void unmask_evtchn(int port)
         */
        if (synch_test_bit(port, &s->evtchn_pending[0]) &&
            !synch_test_and_set_bit(port / BITS_PER_LONG,
-                                   &vcpu_info->evtchn_pending_sel)) {
+                                   &vcpu_info->evtchn_pending_sel))
                vcpu_info->evtchn_upcall_pending = 1;
-               if (!vcpu_info->evtchn_upcall_mask)
-                       force_evtchn_callback();
-       }
 }
 EXPORT_SYMBOL_GPL(unmask_evtchn);
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog