[PATCH] xsplice: Unmask (aka reinstall NMI handler) if we need to abort.

[Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>]

If we have to abort in xsplice_spin() we end following
the goto abort. But unfortunataly we neglected to unmask.
This patch fixes that.

Reported-by: Martin Pohlack <mpohlack@amazon.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

---
Cc: jbeulich@suse.com
Cc: <andrew.cooper3@citrix.com
Cc: ross.lagerwall@citrix.com
Cc: Martin Pohlack <mpohlack@amazon.com>

This has been since v6 posting. v5 posting used the
set_nmi_callback and only used it around the IRQ semaphore.
---
 xen/common/xsplice.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/xen/common/xsplice.c b/xen/common/xsplice.c
index 21b9ec0..b68875b 100644
--- a/xen/common/xsplice.c
+++ b/xen/common/xsplice.c
@@ -1262,9 +1262,10 @@ void check_for_xsplice_work(void)
             arch_xsplice_post_action();
             local_irq_restore(flags);
         }
-        arch_xsplice_unmask();
 
  abort:
+        arch_xsplice_unmask();
+
         per_cpu(work_to_do, cpu) = 0;
         xsplice_work.do_work = 0;
 
-- 
2.5.0


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