diff options
| author |   Jeremy Fitzhardinge <jeremy@goop.org> | 2008-05-26 23:31:05 +0100 |
|---|---|---|
| committer |   Thomas Gleixner <tglx@linutronix.de> | 2008-05-27 10:11:35 +0200 |
| commit | 239d1fc04ed0b58d638096b12a7f6d50269d30c9 (patch) | |
| tree | 746cadf690dd34a07e62ce00e7963bf2eba4710d | |
| parent | xen: allow some cr4 updates (diff) | |
| download | linux-dev-239d1fc04ed0b58d638096b12a7f6d50269d30c9.tar.xz linux-dev-239d1fc04ed0b58d638096b12a7f6d50269d30c9.zip | |
xen: don't worry about preempt during xen_irq_enable()
When enabling interrupts, we don't need to worry about preemption,
because we either enter with interrupts disabled - so no preemption -
or the caller is confused and is re-enabling interrupts on some
indeterminate processor.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | arch/x86/xen/enlighten.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index f6876485ee7d..4a372b71239d 100644 --- a/arch/x86/xen/enlighten.c +++ b/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. */ |