[Xen-changelog] Cull some duplicated code from nmi handling in entry.S.

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1287, 2005/04/11 18:56:17+01:00, kaf24@xxxxxxxxxxxxxxxxxxxx

        Cull some duplicated code from nmi handling in entry.S.
        Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>



 entry.S |   15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)


diff -Nru a/xen/arch/x86/x86_32/entry.S b/xen/arch/x86/x86_32/entry.S
--- a/xen/arch/x86/x86_32/entry.S       2005-04-11 14:04:02 -04:00
+++ b/xen/arch/x86/x86_32/entry.S       2005-04-11 14:04:02 -04:00
@@ -573,16 +573,11 @@
         movl  %edx,%ds
         movl  %edx,%es
         movl  %esp,%edx
-       pushl %ebx   # reason
-       pushl %edx   # regs
+        pushl %ebx   # reason
+        pushl %edx   # regs
         call  SYMBOL_NAME(do_nmi)
-       addl  $8,%esp
-        movl  XREGS_eflags(%esp),%eax
-        movb  XREGS_cs(%esp),%al
-        testl $(3|X86_EFLAGS_VM),%eax
-       jz    restore_all_xen
-        GET_CURRENT(%ebx)
-        jmp   restore_all_guest
+        addl  $8,%esp
+        jmp   ret_from_intr
 
 defer_nmi:
         movl  $FIXMAP_apic_base,%eax
@@ -616,7 +611,7 @@
 nmi_out:movl  %ss:XREGS_eflags(%esp),%eax
         movb  %ss:XREGS_cs(%esp),%al
         testl $(3|X86_EFLAGS_VM),%eax
-       jz    restore_all_xen
+        jz    restore_all_xen
         movl  $(__HYPERVISOR_DS),%edx
         movl  %edx,%ds
         movl  %edx,%es

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