[Xen-changelog] Fix NMI deferral.

[BitKeeper B. <ri...@su...>]

ChangeSet 1.1713, 2005/02/03 20:10:15+00:00, ka...@sc...

	Fix NMI deferral.
	Signed-off-by: kei...@cl...



 entry.S |    4 ++--
 1 files changed, 2 insertions(+), 2 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-02-03 16:03:24 -05:00
+++ b/xen/arch/x86/x86_32/entry.S	2005-02-03 16:03:24 -05:00
@@ -522,12 +522,12 @@
 defer_nmi:
         movl  $FIXMAP_apic_base,%eax
         # apic_wait_icr_idle()
-1:      movl  APIC_ICR(%eax),%ebx
+1:      movl  %ss:APIC_ICR(%eax),%ebx
         testl $APIC_ICR_BUSY,%ebx
         jnz   1b
         # __send_IPI_shortcut(APIC_DEST_SELF, TRAP_deferred_nmi)
         movl  $(APIC_DM_FIXED | APIC_DEST_SELF | APIC_DEST_LOGICAL | \
-                TRAP_deferred_nmi),APIC_ICR(%eax)
+                TRAP_deferred_nmi),%ss:APIC_ICR(%eax)
         jmp   restore_all_xen
 
 nmi_parity_err: