bitkeeper revision 1.1159.223.63 (42028527-fv-d9BM0_LRp8UKGP19gQ)

Fix NMI deferral.
Signed-off-by: keir.fraser@cl.cam.ac.uk

diff --git a/xen/arch/x86/x86_32/entry.S b/xen/arch/x86/x86_32/entry.S
index aeef45059c231512932cd56d71c3210607f21304..1afeded9c9237b1e36a6dde3958d183a9f348abe 100644 (file)
--- a/xen/arch/x86/x86_32/entry.S
+++ b/xen/arch/x86/x86_32/entry.S
@@ -522,12 +522,12 @@ do_watchdog_tick:
 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: