summaryrefslogtreecommitdiff
path: root/ipc
diff options
context:
space:
mode:
authorStanislav Kinsbursky <skinsbursky@parallels.com>2013-01-04 15:35:00 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-01-04 16:11:46 -0800
commitb30efe2775ee0a1d911514292579770b214d31c3 (patch)
treed1059fdc2cd3eb2c44a0b4b2b641a63755db850c /ipc
parent85398aa8de1d68f44ff1b5d0ed9ceb2b0c51ce49 (diff)
downloadlinux-3.10-b30efe2775ee0a1d911514292579770b214d31c3.tar.gz
linux-3.10-b30efe2775ee0a1d911514292579770b214d31c3.tar.bz2
linux-3.10-b30efe2775ee0a1d911514292579770b214d31c3.zip
ipc: convert prepare_copy() from macro to function
This code works if CONFIG_CHECKPOINT_RESTORE is disabled. [akpm@linux-foundation.org: remove __maybe_unused] Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Cc: James Morris <jmorris@namei.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'ipc')
-rw-r--r--ipc/msg.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/ipc/msg.c b/ipc/msg.c
index 7a20536c3a5..038a7d79eb0 100644
--- a/ipc/msg.c
+++ b/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;