From: Jesse Millan <jessem@cs.pdx.edu>
Date: Fri, 8 Jul 2005 00:57:01 +0000 (-0700)
Subject: [PATCH] put_compat_shminfo() warning fix
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=214a627cb401284f87cca7e1510a0f4284f1a17c;p=mv-sheeva.git

[PATCH] put_compat_shminfo() warning fix

GCC 4 complains because the function put_compat_shminfo() can't get to its
return statement if there is no error...  If the function does not return
-EFAULT, it doesn't return anything at all.  Looks like a typo.

Signed-off-by: Jesse Millan <jessem@cs.pdx.edu>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/ipc/compat.c b/ipc/compat.c
index 70e4e4e10fd..3881d564c66 100644
--- a/ipc/compat.c
+++ b/ipc/compat.c
@@ -572,6 +572,7 @@ static inline int put_compat_shminfo(struct shminfo64 *smi,
 	err |= __put_user(smi->shmmni, &up->shmmni);
 	err |= __put_user(smi->shmseg, &up->shmseg);
 	err |= __put_user(smi->shmall, &up->shmall);
+	return err;
 }
 
 static inline int put_compat_shm_info(struct shm_info __user *ip,