summaryrefslogtreecommitdiff
path: root/arch/um/drivers/mconsole_user.c
diff options
context:
space:
mode:
authorEduard-Gabriel Munteanu <maxdamage@aladin.ro>2007-07-16 10:38:51 +0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-16 20:05:38 +0400
commit89df6bfc04059716de2eb2fe529f05b3e124fafd (patch)
tree5f28a79bc65549f48e153f18b1692d9cf462c628 /arch/um/drivers/mconsole_user.c
parente18eecb8b35703a5eea73ee2b45324262029e62c (diff)
downloadlinux-89df6bfc04059716de2eb2fe529f05b3e124fafd.tar.xz
uml: DEBUG_SHIRQ fixes
DEBUG_SHIRQ generates spurious interrupts, triggering handlers such as mconsole_interrupt() or line_interrupt(). They expect data to be available to be read from their sockets/pipes, but in the case of spurious interrupts, the host didn't actually send anything, so UML hangs in read() and friends. Setting those fd's as O_NONBLOCK makes DEBUG_SHIRQ-enabled UML kernels boot and run correctly. Signed-off-by: Eduard-Gabriel Munteanu <maxdamage@aladin.ro> 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>
Diffstat (limited to 'arch/um/drivers/mconsole_user.c')
-rw-r--r--arch/um/drivers/mconsole_user.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/um/drivers/mconsole_user.c b/arch/um/drivers/mconsole_user.c
index 62e5ad63181a..f31e71546e52 100644
--- a/arch/um/drivers/mconsole_user.c
+++ b/arch/um/drivers/mconsole_user.c
@@ -86,8 +86,9 @@ int mconsole_get_request(int fd, struct mc_request *req)
int len;
req->originlen = sizeof(req->origin);
- req->len = recvfrom(fd, &req->request, sizeof(req->request), 0,
- (struct sockaddr *) req->origin, &req->originlen);
+ req->len = recvfrom(fd, &req->request, sizeof(req->request),
+ MSG_DONTWAIT, (struct sockaddr *) req->origin,
+ &req->originlen);
if (req->len < 0)
return 0;