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
Merge to Fedora kernel-2.6.18-1.2255_FC5 patched with stable patch-2.6.18.5-vs2.0...
[linux-2.6.git]
/
arch
/
um
/
kernel
/
irq.c
diff --git
a/arch/um/kernel/irq.c
b/arch/um/kernel/irq.c
index
c2126ee
..
1e766ce
100644
(file)
--- a/
arch/um/kernel/irq.c
+++ b/
arch/um/kernel/irq.c
@@
-369,11
+369,10
@@
void forward_interrupts(int pid)
*/
unsigned int do_IRQ(int irq, union uml_pt_regs *regs)
{
*/
unsigned int do_IRQ(int irq, union uml_pt_regs *regs)
{
- irq_enter();
-
- __do_IRQ(irq, (struct pt_regs *)regs);
- irq_exit();
- return 1;
+ irq_enter();
+ __do_IRQ(irq, (struct pt_regs *)regs);
+ irq_exit();
+ return 1;
}
int um_request_irq(unsigned int irq, int fd, int type,
}
int um_request_irq(unsigned int irq, int fd, int type,