---

yaml --- r: 263627 b: refs/heads/master c: d198d49 h: refs/heads/master i: 263625: edefe7f 263623: 63a355c v: v3
git-mirror · Sep 1, 2011 · c8b27cf · c8b27cf
1 parent 712507a
commit c8b27cf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d312ae878b6aed3912e1acaaf5d0b2a9d08a4f11
+refs/heads/master: d198d499148a0c64a41b3aba9e7dd43772832b91
diff --git a/trunk/arch/x86/xen/xen-asm_32.S b/trunk/arch/x86/xen/xen-asm_32.S
@@ -113,11 +113,13 @@ xen_iret_start_crit:
 
 	/*
 	 * If there's something pending, mask events again so we can
-	 * jump back into xen_hypervisor_callback
+	 * jump back into xen_hypervisor_callback. Otherwise do not
+	 * touch XEN_vcpu_info_mask.
 	 */
-	sete XEN_vcpu_info_mask(%eax)
+	jne 1f
+	movb $1, XEN_vcpu_info_mask(%eax)
 
-	popl %eax
+1:	popl %eax
 
 	/*
 	 * From this point on the registers are restored and the stack