Automatic merge with /usr/src/ntfs-2.6.git.

2 files changed, 2 insertions, 1 deletions

diff --git a/ipc/compat.c b/ipc/compat.c
index 70e4e4e10f..3881d564c6 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,
diff --git a/ipc/util.h b/ipc/util.h
index 07d6894523..44348ca5a7 100644
--- a/ipc/util.h
+++ b/ipc/util.h
@@ -67,7 +67,7 @@ int ipc_checkid(struct ipc_ids* ids, struct kern_ipc_perm* ipcp, int uid);
 void kernel_to_ipc64_perm(struct kern_ipc_perm *in, struct ipc64_perm *out);
 void ipc64_perm_to_ipc_perm(struct ipc64_perm *in, struct ipc_perm *out);
 
-#if defined(__ia64__) || defined(__x86_64__) || defined(__hppa__)
+#if defined(__ia64__) || defined(__x86_64__) || defined(__hppa__) || defined(__XTENSA__)
   /* On IA-64, we always use the "64-bit version" of the IPC structures.  */ 
 # define ipc_parse_version(cmd) IPC_64
 #else