From 9d9f893473fa64b0c647b4f5f4335f9cf9374eec Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Mon, 26 May 2008 23:31:05 +0100 Subject: [PATCH] --- yaml --- r: 99537 b: refs/heads/master c: 239d1fc04ed0b58d638096b12a7f6d50269d30c9 h: refs/heads/master i: 99535: 6e15d1b74d28f98284ea4e3d1788f9d5228cc8af v: v3 --- [refs] | 2 +- trunk/arch/x86/xen/enlighten.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index bfc64a0473e5..f7f8f0d08d89 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2956a3511c8c5dccb1d4739ead17c7c3c23a24b7 +refs/heads/master: 239d1fc04ed0b58d638096b12a7f6d50269d30c9 diff --git a/trunk/arch/x86/xen/enlighten.c b/trunk/arch/x86/xen/enlighten.c index f6876485ee7d..4a372b71239d 100644 --- a/trunk/arch/x86/xen/enlighten.c +++ b/trunk/arch/x86/xen/enlighten.c @@ -235,13 +235,13 @@ static void xen_irq_enable(void) { struct vcpu_info *vcpu; - /* There's a one instruction preempt window here. We need to - make sure we're don't switch CPUs between getting the vcpu - pointer and updating the mask. */ - preempt_disable(); + /* We don't need to worry about being preempted here, since + either a) interrupts are disabled, so no preemption, or b) + the caller is confused and is trying to re-enable interrupts + on an indeterminate processor. */ + vcpu = x86_read_percpu(xen_vcpu); vcpu->evtchn_upcall_mask = 0; - preempt_enable_no_resched(); /* Doesn't matter if we get preempted here, because any pending event will get dealt with anyway. */