1.1 --- a/xen/arch/x86/x86_32/entry.S	Mon Apr 11 15:24:58 2005 +0000
     1.2 +++ b/xen/arch/x86/x86_32/entry.S	Mon Apr 11 17:56:17 2005 +0000
     1.3 @@ -573,16 +573,11 @@ do_watchdog_tick:
     1.4          movl  %edx,%ds
     1.5          movl  %edx,%es
     1.6          movl  %esp,%edx
     1.7 -	pushl %ebx   # reason
     1.8 -	pushl %edx   # regs
     1.9 +        pushl %ebx   # reason
    1.10 +        pushl %edx   # regs
    1.11          call  SYMBOL_NAME(do_nmi)
    1.12 -	addl  $8,%esp
    1.13 -        movl  XREGS_eflags(%esp),%eax
    1.14 -        movb  XREGS_cs(%esp),%al
    1.15 -        testl $(3|X86_EFLAGS_VM),%eax
    1.16 -	jz    restore_all_xen
    1.17 -        GET_CURRENT(%ebx)
    1.18 -        jmp   restore_all_guest
    1.19 +        addl  $8,%esp
    1.20 +        jmp   ret_from_intr
    1.21  
    1.22  defer_nmi:
    1.23          movl  $FIXMAP_apic_base,%eax
    1.24 @@ -616,7 +611,7 @@ nmi_parity_err:
    1.25  nmi_out:movl  %ss:XREGS_eflags(%esp),%eax
    1.26          movb  %ss:XREGS_cs(%esp),%al
    1.27          testl $(3|X86_EFLAGS_VM),%eax
    1.28 -	jz    restore_all_xen
    1.29 +        jz    restore_all_xen
    1.30          movl  $(__HYPERVISOR_DS),%edx
    1.31          movl  %edx,%ds
    1.32          movl  %edx,%es