diff options
author | Anton Altaparmakov <aia21@cantab.net> | 2005-07-13 23:09:23 +0100 |
---|---|---|
committer | Anton Altaparmakov <aia21@cantab.net> | 2005-07-13 23:09:23 +0100 |
commit | c514720716c7b109ff980f8b3cb93f9af872c91c (patch) | |
tree | 490a9578995705de69712893a190b67651bddc56 /ipc/compat.c | |
parent | 07929dcb963786512c760dd3ecd148d89295e7e5 (diff) | |
parent | 1e279dd855d15b72364b4103f872d67d8592647e (diff) |
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'ipc/compat.c')
-rw-r--r-- | ipc/compat.c | 1 |
1 files changed, 1 insertions, 0 deletions
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, |