From 5128de0813cddac4fd3187b10f2322b84398b6a3 Mon Sep 17 00:00:00 2001
From: Jesse Millan <jessem@cs.pdx.edu>
Date: Thu, 7 Jul 2005 17:57:01 -0700
Subject: [PATCH] --- yaml --- r: 4266 b: refs/heads/master c:
 214a627cb401284f87cca7e1510a0f4284f1a17c h: refs/heads/master v: v3

---
 [refs]             | 2 +-
 trunk/ipc/compat.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0b79b2a9fdd9..d619b9c1d7aa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff87b37da912d6aeab6c20c58f51b34d3e37f111
+refs/heads/master: 214a627cb401284f87cca7e1510a0f4284f1a17c
diff --git a/trunk/ipc/compat.c b/trunk/ipc/compat.c
index 70e4e4e10fd1..3881d564c668 100644
--- a/trunk/ipc/compat.c
+++ b/trunk/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,