The patch titled
Subject: ipc: convert prepare_copy() from macro to function
has been removed from the -mm tree. Its filename was
ipc-convert-prepare_copy-from-macro-to-function.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Stanislav Kinsbursky <skinsbursky@xxxxxxxxxxxxx>
Subject: ipc: convert prepare_copy() from macro to function
This code works if CONFIG_CHECKPOINT_RESTORE is disabled.
[akpm@xxxxxxxxxxxxxxxxxxxx: remove __maybe_unused]
Signed-off-by: Stanislav Kinsbursky <skinsbursky@xxxxxxxxxxxxx>
Cc: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx>
Cc: James Morris <jmorris@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
ipc/msg.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff -puN ipc/msg.c~ipc-convert-prepare_copy-from-macro-to-function ipc/msg.c
--- a/ipc/msg.c~ipc-convert-prepare_copy-from-macro-to-function
+++ a/ipc/msg.c
@@ -803,8 +803,15 @@ static inline void free_copy(struct msg_
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 *b
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;
_
Patches currently in -mm which might be from skinsbursky@xxxxxxxxxxxxx are
origin.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
