Commit:     7b5cc6ee6cf9001775c348bac09814a45f1276b7
Parent:     2dc5802a22d68d83ef4c3d616912949a6527bb65
Author:     Karol Swietlicki <[EMAIL PROTECTED]>
AuthorDate: Mon Feb 4 22:31:04 2008 -0800
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Tue Feb 5 09:44:29 2008 -0800

    uml: fix mconsole stop
    Bring back the functionality of stopping user mode linux with the help of
    [jdike - the bug being fixed is that the mconsole file descriptor is already
    set O_NONBLOCK or not, depending on whether we want no blocking (the normal
    case) or we want blocking (when an mconsole stop is in effect), so the
    MSG_DONTWAIT is redundant in the normal case, and wrong when we want to
    Signed-off-by: Karol Swietlicki <[EMAIL PROTECTED]>
    Signed-off-by: Jeff Dike <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 arch/um/drivers/mconsole_user.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/arch/um/drivers/mconsole_user.c b/arch/um/drivers/mconsole_user.c
index 430c024..13af2f0 100644
--- a/arch/um/drivers/mconsole_user.c
+++ b/arch/um/drivers/mconsole_user.c
@@ -83,9 +83,8 @@ 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),
-                           MSG_DONTWAIT, (struct sockaddr *) req->origin,
-                           &req->originlen);
+       req->len = recvfrom(fd, &req->request, sizeof(req->request), 0,
+                           (struct sockaddr *) req->origin, &req->originlen);
        if (req->len < 0)
                return 0;
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to