From dc3c6686e653f53285b5e62eebb8dae32a79efa3 Mon Sep 17 00:00:00 2001 From: "kaf24@scramble.cl.cam.ac.uk" Date: Thu, 3 Feb 2005 20:10:15 +0000 Subject: bitkeeper revision 1.1159.223.63 (42028527-fv-d9BM0_LRp8UKGP19gQ) Fix NMI deferral. Signed-off-by: keir.fraser@cl.cam.ac.uk --- xen/arch/x86/x86_32/entry.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/x86_32/entry.S b/xen/arch/x86/x86_32/entry.S index aeef45059c..1afeded9c9 100644 --- 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: -- cgit v1.2.3