git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
arch
/
i386
/
kernel
/
vm86.c
diff --git
a/arch/i386/kernel/vm86.c
b/arch/i386/kernel/vm86.c
index
80b3026
..
483e9b2
100644
(file)
--- a/
arch/i386/kernel/vm86.c
+++ b/
arch/i386/kernel/vm86.c
@@
-723,14
+723,7
@@
static irqreturn_t irq_handler(int intno, void *dev_id, struct pt_regs * regs)
irqbits |= irq_bit;
if (vm86_irqs[intno].sig)
send_sig(vm86_irqs[intno].sig, vm86_irqs[intno].tsk, 1);
irqbits |= irq_bit;
if (vm86_irqs[intno].sig)
send_sig(vm86_irqs[intno].sig, vm86_irqs[intno].tsk, 1);
- spin_unlock_irqrestore(&irqbits_lock, flags);
- /*
- * IRQ will be re-enabled when user asks for the irq (whether
- * polling or as a result of the signal)
- */
- disable_irq(intno);
- return IRQ_HANDLED;
-
+ /* else user will poll for IRQs */
out:
spin_unlock_irqrestore(&irqbits_lock, flags);
return IRQ_NONE;
out:
spin_unlock_irqrestore(&irqbits_lock, flags);
return IRQ_NONE;
@@
-748,7
+741,7
@@
static inline void free_vm86_irq(int irqnumber)
spin_unlock_irqrestore(&irqbits_lock, flags);
}
spin_unlock_irqrestore(&irqbits_lock, flags);
}
-void release_
vm
86_irqs(struct task_struct *task)
+void release_
x
86_irqs(struct task_struct *task)
{
int i;
for (i = FIRST_VM86_IRQ ; i <= LAST_VM86_IRQ; i++)
{
int i;
for (i = FIRST_VM86_IRQ ; i <= LAST_VM86_IRQ; i++)