Index: 2006-08-16/xen/arch/x86/x86_64/entry.S
===================================================================
--- 2006-08-16.orig/xen/arch/x86/x86_64/entry.S	2006-08-22 12:47:14.000000000 +0200
+++ 2006-08-16/xen/arch/x86/x86_64/entry.S	2006-08-22 12:48:12.000000000 +0200
@@ -152,7 +152,7 @@ ENTRY(syscall_enter)
 #ifndef NDEBUG
         /* Deliberately corrupt parameter regs used by this hypercall. */
         popq  %r10         # Shadow RIP
-        cmpq  %r10,UREGS_rip(%rsp)
+        cmpq  %r10,UREGS_rip+8(%rsp)
         popq  %rcx         # Shadow hypercall index
         jne   skip_clobber /* If RIP has changed then don't clobber. */
         leaq  hypercall_args_table(%rip),%r10