diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c
index 52c7f37..6b3620b 100644
--- a/xen/arch/x86/domain.c
+++ b/xen/arch/x86/domain.c
@@ -1723,6 +1723,16 @@ void sync_vcpu_execstate(struct vcpu *v)
     __arg;                                                                  \
 })
 
+void hypercall_cancel_continuation(void)
+{
+    struct cpu_user_regs *regs = guest_cpu_user_regs();
+
+    if ( !is_hvm_vcpu(current) )
+        regs->eip += 2; /* skip re-execute 'syscall' / 'int $xx' */
+    else
+        current->arch.hvm_vcpu.hcall_preempted = 0;
+}
+
 unsigned long hypercall_create_continuation(
     unsigned int op, const char *format, ...)
 {
diff --git a/xen/arch/x86/x86_64/compat/mm.c b/xen/arch/x86/x86_64/compat/mm.c
index 2c05099..577da6a 100644
--- a/xen/arch/x86/x86_64/compat/mm.c
+++ b/xen/arch/x86/x86_64/compat/mm.c
@@ -133,7 +133,10 @@ int compat_arch_memory_op(int op, XEN_GUEST_HANDLE(void) arg)
         XLAT_pod_target(&cmp, nat);
 
         if ( copy_to_guest(arg, &cmp, 1) )
+        {
+            hypercall_cancel_continuation();
             rc = -EFAULT;
+        }
 
         break;
     }
diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h
index 3ba5495..80d5c4b 100644
--- a/xen/include/xen/sched.h
+++ b/xen/include/xen/sched.h
@@ -554,6 +554,7 @@ extern void (*dead_idle) (void);
  */
 unsigned long hypercall_create_continuation(
     unsigned int op, const char *format, ...);
+void hypercall_cancel_continuation(void);
 
 #define hypercall_preempt_check() (unlikely(    \
         softirq_pending(smp_processor_id()) |   \