Commit 9ac625a3 authored Nov 14, 2007 by Jeff Dike Committed by Linus Torvalds Nov 14, 2007

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>

parent 7c06a8dc

arch/um/kernel/irq.c

+7 −6

Original line number	Original line	Diff line number	Diff line
	@@ -347,14 +347,15 @@ int um_request_irq(unsigned int irq, int fd, int type,
	{		{
	int err;		int err;

	err = request_irq(irq, handler, irqflags, devname, dev_id);		if (fd != -1) {
			err = activate_fd(irq, fd, type, dev_id);
	if (err)		if (err)
	return err;		return err;
			}

	if (fd != -1)		return request_irq(irq, handler, irqflags, devname, dev_id);
	err = activate_fd(irq, fd, type, dev_id);
	return err;
	}		}

	EXPORT_SYMBOL(um_request_irq);		EXPORT_SYMBOL(um_request_irq);
	EXPORT_SYMBOL(reactivate_fd);		EXPORT_SYMBOL(reactivate_fd);