From 25f0830d3d6263e468c114510b8150759125a664 Mon Sep 17 00:00:00 2001
From: Stanislav Kinsbursky <skinsbursky@parallels.com>
Date: Fri, 4 Jan 2013 15:35:00 -0800
Subject: [PATCH] --- yaml --- r: 348272 b: refs/heads/master c:
 b30efe2775ee0a1d911514292579770b214d31c3 h: refs/heads/master v: v3

---
 [refs]          |  2 +-
 trunk/ipc/msg.c | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 0978772135a8..cf06df9d4e6d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85398aa8de1d68f44ff1b5d0ed9ceb2b0c51ce49
+refs/heads/master: b30efe2775ee0a1d911514292579770b214d31c3
diff --git a/trunk/ipc/msg.c b/trunk/ipc/msg.c
index 7a20536c3a50..038a7d79eb0e 100644
--- a/trunk/ipc/msg.c
+++ b/trunk/ipc/msg.c
@@ -803,8 +803,15 @@ static inline void free_copy(struct msg_msg *copy)
 		free_msg(copy);
 }
 #else
-#define prepare_copy(buf, sz, msgflg, msgtyp, copy_nr)	ERR_PTR(-ENOSYS)
 #define fill_copy(copy_nr, msg_nr, msg, copy)		NULL
+
+static inline struct msg_msg *prepare_copy(void __user *buf, size_t bufsz,
+					   int msgflg, long *msgtyp,
+					   unsigned long *copy_number)
+{
+	return ERR_PTR(-ENOSYS);
+}
+
 static inline void free_copy(struct msg_msg *copy)
 {
 }
@@ -819,7 +826,7 @@ long do_msgrcv(int msqid, void __user *buf, size_t bufsz, long msgtyp,
 	int mode;
 	struct ipc_namespace *ns;
 	struct msg_msg *copy = NULL;
-	unsigned long __maybe_unused copy_number;
+	unsigned long copy_number = 0;
 
 	if (msqid < 0 || (long) bufsz < 0)
 		return -EINVAL;