From 871be223bf36d6ca903610b55e3d782276813333 Mon Sep 17 00:00:00 2001 From: Stanislav Kinsbursky Date: Mon, 1 Apr 2013 11:40:51 +0400 Subject: [PATCH] --- yaml --- r: 362122 b: refs/heads/master c: 2dc958fa2fe6987e7ab106bd97029a09a82fcd8d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/ipc/msg.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 97f92ed109c4..68c35f5f6446 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 118c9a45fdacc6fe57910fa1d048e2d5bbc193f4 +refs/heads/master: 2dc958fa2fe6987e7ab106bd97029a09a82fcd8d diff --git a/trunk/ipc/msg.c b/trunk/ipc/msg.c index 31cd1bf6af27..fede1d06ef30 100644 --- a/trunk/ipc/msg.c +++ b/trunk/ipc/msg.c @@ -872,6 +872,7 @@ long do_msgrcv(int msqid, void __user *buf, size_t bufsz, long msgtyp, goto out_unlock; break; } + msg = ERR_PTR(-EAGAIN); } else break; msg_counter++;