Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[deliverable/linux.git] / ipc / mqueue.c

diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index b3b69fd5133024f9c7aaa116cab75c65772379d4..3e84b958186b5d043ef34c706ff4036433f93c8b 100644 (file)
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -1054,7 +1054,7 @@ retry:
                        }
 
                        timeo = MAX_SCHEDULE_TIMEOUT;
-                       ret = netlink_attachskb(sock, nc, 0, &timeo, NULL);
+                       ret = netlink_attachskb(sock, nc, &timeo, NULL);
                        if (ret == 1)
                                goto retry;
                        if (ret) {