OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

uml: fix spurious IRQ testing 

The spurious IRQ testing in request_irq is mishandled in um_request_irq, which
sets the incoming file descriptors non-blocking only after request_irq
succeeds.  This results in the spurious irq calling read on a blocking
descriptor, and a hang.

Fixed by reversing the O_NONBLOCK setting and the request_irq call.

Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jeff Dike 2007-11-14 17:00:23 -08:00 committed by Linus Torvalds
parent 7c06a8dc64
commit 9ac625a398
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arch/um/kernel/irq.c
View File

@ -347,14 +347,15 @@ int um_request_irq(unsigned int irq, int fd, int type,
{
int err;
err = request_irq(irq, handler, irqflags, devname, dev_id);
if (err)
return err;
if (fd != -1)
if (fd != -1) {
err = activate_fd(irq, fd, type, dev_id);
return err;
if (err)
return err;
}
return request_irq(irq, handler, irqflags, devname, dev_id);
}
EXPORT_SYMBOL(um_request_irq);
EXPORT_SYMBOL(reactivate_fd);