From: Andrew Morton <akpm@linux-foundation.org>
Date: Thu, 29 Nov 2012 03:19:00 +0000 (+1100)
Subject: ipc-convert-prepare_copy-from-macro-to-function-fix
X-Git-Tag: next-20121205~1^2~69
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bdfd7ae6efe1f9d387433d098e4670f2dd286c73;p=karo-tx-linux.git

ipc-convert-prepare_copy-from-macro-to-function-fix

remove __maybe_unused

Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: James Morris <jmorris@namei.org>
Cc: Stanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

diff --git a/ipc/msg.c b/ipc/msg.c
index d1bd7789c296..038a7d79eb0e 100644
--- a/ipc/msg.c
+++ b/ipc/msg.c
@@ -826,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 = 0;
+	unsigned long copy_number = 0;
 
 	if (msqid < 0 || (long) bufsz < 0)
 		return -EINVAL;