From c8b27cf9e2f02238d001c232114d6a9421a6956a Mon Sep 17 00:00:00 2001 From: Igor Mammedov Date: Thu, 1 Sep 2011 13:46:55 +0200 Subject: [PATCH] --- yaml --- r: 263627 b: refs/heads/master c: d198d499148a0c64a41b3aba9e7dd43772832b91 h: refs/heads/master i: 263625: edefe7ff62e1ba17b28b22cb1f0ed5fe43d26c4f 263623: 63a355c7145fa9677ee4321cf85b72c933fdbbd8 v: v3 --- [refs] | 2 +- trunk/arch/x86/xen/xen-asm_32.S | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 5ea719ef473c..d2c9d8300978 100644 --- 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 index 22a2093b5862..b040b0e518ca 100644 --- 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