[Xen-changelog] [xen master] xsplice: Unmask (aka reinstall NMI handler) if we need to abort.

[patchbot@xxxxxxx]

commit c5ed88110cd1b72af643d7d9e255d587f2c90d3d
Author:     Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
AuthorDate: Wed May 11 09:59:08 2016 -0400
Commit:     Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
CommitDate: Wed May 11 11:54:54 2016 -0400

    xsplice: Unmask (aka reinstall NMI handler) if we need to abort.
    
    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@xxxxxxxxxx>
    Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
    Reviewed-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Reviewed-by: Wei Liu <wei.liu2@xxxxxxxxxx>
    Release-acked-by: Wei Liu <wei.liu2@xxxxxxxxxx>
---
 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;
 
--
generated by git-patchbot for /home/xen/git/xen.git#master

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