xen-changelog

[Top] [All Lists]

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

from [BitKeeper Bot]

[Permanent Link][Original]

To:	xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject:	[Xen-changelog] Cull some duplicated code from nmi handling in entry.S.
From:	BitKeeper Bot <riel@xxxxxxxxxxx>
Date:	Mon, 11 Apr 2005 17:56:17 +0000
Delivery-date:	Mon, 11 Apr 2005 18:03:52 +0000
Envelope-to:	www-data@xxxxxxxxxxxxxxxxxxx
List-help:	<mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id:	BK change log <xen-changelog.lists.xensource.com>
List-post:	<mailto:xen-changelog@lists.xensource.com>
List-subscribe:	<http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe:	<http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to:	Xen Development List <xen-devel@xxxxxxxxxxxxxxxxxxx>
Sender:	xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx

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

[More with this subject...]

<Prev in Thread]	Current Thread	[Next in Thread>
[Xen-changelog] Cull some duplicated code from nmi handling in entry.S., BitKeeper Bot <=

Previous by Date:	[Xen-changelog] Define atomic functions ourselves rather than relying on, BitKeeper Bot
Next by Date:	[Xen-changelog] [PATCH] stream fixes for migration, BitKeeper Bot
Previous by Thread:	[Xen-changelog] Define atomic functions ourselves rather than relying on, BitKeeper Bot
Next by Thread:	[Xen-changelog] [PATCH] stream fixes for migration, BitKeeper Bot
Indexes:	[Date] [Thread] [Top] [All Lists]