diff options
| author | Andi Kleen <ak@linux.intel.com> | 2008-07-21 18:16:54 -0400 |
|---|---|---|
| committer | Andi Kleen <ak@linux.intel.com> | 2008-07-21 18:16:54 -0400 |
| commit | 8294fafdafc602ed11f401c44628fab8558c5cf5 (patch) | |
| tree | c8d0371cfd05226b56d52bfde9c69f8caca4501d /ipc/mqueue.c | |
| parent | 725c3a2d70f958adee807c178178819a50f68a56 (diff) | |
| parent | bf20e740a4bcc686de02e2fd1c1810a58872f46e (diff) | |
Merge branch 'for-upstream/acpi-test' of git://repo.or.cz/linux-2.6/linux-acpi-2.6/ibm-acpi-2.6 into release-2.6.27
Diffstat (limited to 'ipc/mqueue.c')
| -rw-r--r-- | ipc/mqueue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ipc/mqueue.c b/ipc/mqueue.c index b3b69fd51330..3e84b958186b 100644 --- a/ipc/mqueue.c +++ b/ipc/mqueue.c | |||
| @@ -1054,7 +1054,7 @@ retry: | |||
| 1054 | } | 1054 | } |
| 1055 | 1055 | ||
| 1056 | timeo = MAX_SCHEDULE_TIMEOUT; | 1056 | timeo = MAX_SCHEDULE_TIMEOUT; |
| 1057 | ret = netlink_attachskb(sock, nc, 0, &timeo, NULL); | 1057 | ret = netlink_attachskb(sock, nc, &timeo, NULL); |
| 1058 | if (ret == 1) | 1058 | if (ret == 1) |
| 1059 | goto retry; | 1059 | goto retry; |
| 1060 | if (ret) { | 1060 | if (ret) { |