From 734fb933e7b1726bf5d3f41e021ee9bfff70d954 Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Mon, 30 Jul 2012 14:42:40 -0700 Subject: [PATCH] --- yaml --- r: 319979 b: refs/heads/master c: b610c04c667f3c056243fd64041c7f152a512ee4 h: refs/heads/master i: 319977: 513416827d25a62529f42b3001ac97859d83c510 319975: a6bf3045867822fa6e0b32e533a50ee3a9776e54 v: v3 --- [refs] | 2 +- trunk/include/linux/compat.h | 1 + trunk/ipc/compat.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b5976153281e..cc73a34fa49b 100644 --- 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 index 4e890394ef99..9f68e90a14ec 100644 --- 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 index 53cebdf80e3c..a41600f6ba52 100644 --- 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