1.1 --- a/xen/arch/x86/x86_32/entry.S	Wed Dec 29 13:43:52 2004 +0000
     1.2 +++ b/xen/arch/x86/x86_32/entry.S	Wed Dec 29 14:22:46 2004 +0000
     1.3 @@ -495,16 +495,10 @@ ENTRY(nmi)
     1.4          movb  XREGS_cs(%esp),%al
     1.5          testl $(3|X86_EFLAGS_VM),%eax
     1.6          jnz   do_watchdog_tick
     1.7 -        movl  XREGS_ds(%esp),%eax
     1.8 +        movl  %ds,%eax
     1.9          cmpw  $(__HYPERVISOR_DS),%ax
    1.10          jne   restore_all_xen
    1.11 -        movl  XREGS_es(%esp),%eax
    1.12 -        cmpw  $(__HYPERVISOR_DS),%ax
    1.13 -        jne   restore_all_xen
    1.14 -        movl  XREGS_fs(%esp),%eax
    1.15 -        cmpw  $(__HYPERVISOR_DS),%ax
    1.16 -        jne   restore_all_xen
    1.17 -        movl  XREGS_gs(%esp),%eax
    1.18 +        movl  %es,%eax
    1.19          cmpw  $(__HYPERVISOR_DS),%ax
    1.20          jne   restore_all_xen
    1.21