summaryrefslogtreecommitdiff
path: root/ipc
diff options
context:
space:
mode:
authorJesse Millan <jessem@cs.pdx.edu>2005-07-08 04:57:01 +0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-08 05:23:46 +0400
commit214a627cb401284f87cca7e1510a0f4284f1a17c (patch)
tree5b6724028b520fa4002a5a9e752a90cd3d179522 /ipc
parentff87b37da912d6aeab6c20c58f51b34d3e37f111 (diff)
downloadlinux-214a627cb401284f87cca7e1510a0f4284f1a17c.tar.xz
[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>
Diffstat (limited to 'ipc')
-rw-r--r--ipc/compat.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/ipc/compat.c b/ipc/compat.c
index 70e4e4e10fd1..3881d564c668 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,