---

yaml --- r: 319979 b: refs/heads/master c: b610c04 h: refs/heads/master i: 319977: 5134168 319975: a6bf304 v: v3
git-mirror · Jul 31, 2012 · 734fb93 · 734fb93
1 parent 33d86b1
commit 734fb93
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 079a96ae3871f0ed9083aac2218136ccec5b9877
+refs/heads/master: b610c04c667f3c056243fd64041c7f152a512ee4
diff --git a/trunk/include/linux/compat.h b/trunk/include/linux/compat.h
@@ -256,6 +256,7 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
 			   compat_size_t __user *len_ptr);
 
 #ifdef CONFIG_ARCH_WANT_OLD_COMPAT_IPC
+#define __ARCH_WANT_COMPAT_IPC_PARSE_VERSION
 long compat_sys_semctl(int first, int second, int third, void __user *uptr);
 long compat_sys_msgsnd(int first, int second, int third, void __user *uptr);
 long compat_sys_msgrcv(int first, int second, int msgtyp, int third,

diff --git a/trunk/ipc/compat.c b/trunk/ipc/compat.c
@@ -118,7 +118,7 @@ extern int sem_ctls[];
 
 static inline int compat_ipc_parse_version(int *cmd)
 {
-#ifdef CONFIG_ARCH_WANT_OLD_COMPAT_IPC
+#ifdef	__ARCH_WANT_COMPAT_IPC_PARSE_VERSION
 	int version = *cmd & IPC_64;
 
 	/* this is tricky: architectures that have support for the old