1.1 --- a/xen/arch/x86/x86_32/entry.S	Wed Sep 20 09:48:41 2006 +0100
     1.2 +++ b/xen/arch/x86/x86_32/entry.S	Wed Sep 20 09:56:50 2006 +0100
     1.3 @@ -198,7 +198,7 @@ ENTRY(hypercall)
     1.4          /* Deliberately corrupt parameter regs used by this hypercall. */
     1.5          addl  $24,%esp     # Shadow parameters
     1.6          popl  %ecx         # Shadow EIP
     1.7 -        cmpl  %ecx,UREGS_eip(%esp)
     1.8 +        cmpl  %ecx,UREGS_eip+4(%esp)
     1.9          popl  %ecx         # Shadow hypercall index
    1.10          jne   skip_clobber # If EIP has changed then don't clobber
    1.11          movzb hypercall_args_table(,%ecx,1),%ecx

     2.1 --- a/xen/arch/x86/x86_64/entry.S	Wed Sep 20 09:48:41 2006 +0100
     2.2 +++ b/xen/arch/x86/x86_64/entry.S	Wed Sep 20 09:56:50 2006 +0100
     2.3 @@ -152,7 +152,7 @@ ENTRY(syscall_enter)
     2.4  #ifndef NDEBUG
     2.5          /* Deliberately corrupt parameter regs used by this hypercall. */
     2.6          popq  %r10         # Shadow RIP
     2.7 -        cmpq  %r10,UREGS_rip(%rsp)
     2.8 +        cmpq  %r10,UREGS_rip+8(%rsp)
     2.9          popq  %rcx         # Shadow hypercall index
    2.10          jne   skip_clobber /* If RIP has changed then don't clobber. */
    2.11          leaq  hypercall_args_table(%rip),%r10