diff options
author | Ingo Molnar <mingo@kernel.org> | 2013-04-19 07:03:08 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-04-19 07:03:08 -0400 |
commit | 5379f8c0d72cab43bbe6d974ceb3ad84dddc2b8e (patch) | |
tree | 524d8ac34cc8c7ef68b43e3ee6e08e27db86299c /ipc/msg.c | |
parent | b6d5278dc8385eaf2e3904a4af444a04f6ae4e71 (diff) | |
parent | 94c1acf2c85b03a59a42d931a94a13a76c123a62 (diff) |
Merge tag 'edac_amd_f16h' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras into x86/ras
Pull AMD F16h support for amd64_edac from Borislav Petkov.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'ipc/msg.c')
-rw-r--r-- | ipc/msg.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -872,6 +872,7 @@ long do_msgrcv(int msqid, void __user *buf, size_t bufsz, long msgtyp, | |||
872 | goto out_unlock; | 872 | goto out_unlock; |
873 | break; | 873 | break; |
874 | } | 874 | } |
875 | msg = ERR_PTR(-EAGAIN); | ||
875 | } else | 876 | } else |
876 | break; | 877 | break; |
877 | msg_counter++; | 878 | msg_counter++; |