debuggers.hg

changeset 3675:8710698e57e1

find changesets by author, revision, files, or words in the commit message
bitkeeper revision 1.1159.240.2 (42028548cWA5UfVOtIVVGp5n3bPOKQ)

Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
author kaf24@scramble.cl.cam.ac.uk
date Thu Feb 03 20:10:48 2005 +0000 (2005-02-03)
parents 10b8afffe96b fb875591fd72
children dbc41aaba297 26a00896163a
files xen/arch/x86/x86_32/entry.S
line diff
     1.1 --- a/xen/arch/x86/x86_32/entry.S	Thu Feb 03 17:24:49 2005 +0000
     1.2 +++ b/xen/arch/x86/x86_32/entry.S	Thu Feb 03 20:10:48 2005 +0000
     1.3 @@ -630,12 +630,12 @@ do_watchdog_tick:
     1.4  defer_nmi:
     1.5          movl  $FIXMAP_apic_base,%eax
     1.6          # apic_wait_icr_idle()
     1.7 -1:      movl  APIC_ICR(%eax),%ebx
     1.8 +1:      movl  %ss:APIC_ICR(%eax),%ebx
     1.9          testl $APIC_ICR_BUSY,%ebx
    1.10          jnz   1b
    1.11          # __send_IPI_shortcut(APIC_DEST_SELF, TRAP_deferred_nmi)
    1.12          movl  $(APIC_DM_FIXED | APIC_DEST_SELF | APIC_DEST_LOGICAL | \
    1.13 -                TRAP_deferred_nmi),APIC_ICR(%eax)
    1.14 +                TRAP_deferred_nmi),%ss:APIC_ICR(%eax)
    1.15          jmp   restore_all_xen
    1.16  
    1.17  nmi_parity_err: