From mboxrd@z Thu Jan 1 00:00:00 1970 From: arnd-r2nGTMty4D4@public.gmane.org Subject: [RFC 13/17] ipc: use __ARCH_WANT_IPC_PARSE_VERSION in ipc/util.h Date: Mon, 27 Apr 2009 17:01:27 +0200 Message-ID: <20090427150319.391473010@arndb.de> References: <20090427142010.587518220@arndb.de> Return-path: Content-Disposition: inline; filename=0022-ipc-use-__ARCH_WANT_IPC_PARSE_VERSION-in-ipc-util.h.patch Sender: linux-api-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: john.williams-g5w7nrANp4BDPfheJLI6IQ@public.gmane.org, monstr-pSz03upnqPeHXe+LvDLADg@public.gmane.org, linux-api-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arch-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, liqin.chen-+XGAvkf1AAHby3iVrkZq2A@public.gmane.org, Sam Ravnborg , Remis Lima Baima List-Id: linux-arch.vger.kernel.org The definition of ipc_parse_version depends on __ARCH_WANT_IPC_PARSE_VERSION, but the header file declares it conditionally based on the architecture. Use the macro consistently to make it easier to add new architectures. Signed-off-by: Arnd Bergmann --- ipc/util.h | 2 1 + 1 - 0 ! 1 file changed, 1 insertion(+), 1 deletion(-) Index: linux-2.6/ipc/util.h =================================================================== --- linux-2.6.orig/ipc/util.h +++ linux-2.6/ipc/util.h @@ -128,7 +128,7 @@ void ipc_update_perm(struct ipc64_perm * struct kern_ipc_perm *ipcctl_pre_down(struct ipc_ids *ids, int id, int cmd, struct ipc64_perm *perm, int extra_perm); -#if defined(__ia64__) || defined(__x86_64__) || defined(__hppa__) || defined(__XTENSA__) +#ifndef __ARCH_WANT_IPC_PARSE_VERSION /* On IA-64, we always use the "64-bit version" of the IPC structures. */ # define ipc_parse_version(cmd) IPC_64 #else -- -- To unsubscribe from this list: send the line "unsubscribe linux-api" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from moutng.kundenserver.de ([212.227.126.188]:58326 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756228AbZD0PHm (ORCPT ); Mon, 27 Apr 2009 11:07:42 -0400 Message-ID: <20090427150319.391473010@arndb.de> References: <20090427142010.587518220@arndb.de> Date: Mon, 27 Apr 2009 17:01:27 +0200 From: arnd@arndb.de Subject: [RFC 13/17] ipc: use __ARCH_WANT_IPC_PARSE_VERSION in ipc/util.h Content-Disposition: inline; filename=0022-ipc-use-__ARCH_WANT_IPC_PARSE_VERSION-in-ipc-util.h.patch Sender: linux-arch-owner@vger.kernel.org List-ID: To: linux-kernel@vger.kernel.org Cc: john.williams@petalogix.com, monstr@monstr.eu, linux-api@vger.kernel.org, linux-arch@vger.kernel.org, liqin.chen@sunplusct.com, Sam Ravnborg , Remis Lima Baima Message-ID: <20090427150127._alsyWSqpgNNBSLdV7XFq8Qtr0KZeTDD3jQehgekRYc@z> The definition of ipc_parse_version depends on __ARCH_WANT_IPC_PARSE_VERSION, but the header file declares it conditionally based on the architecture. Use the macro consistently to make it easier to add new architectures. Signed-off-by: Arnd Bergmann --- ipc/util.h | 2 1 + 1 - 0 ! 1 file changed, 1 insertion(+), 1 deletion(-) Index: linux-2.6/ipc/util.h =================================================================== --- linux-2.6.orig/ipc/util.h +++ linux-2.6/ipc/util.h @@ -128,7 +128,7 @@ void ipc_update_perm(struct ipc64_perm * struct kern_ipc_perm *ipcctl_pre_down(struct ipc_ids *ids, int id, int cmd, struct ipc64_perm *perm, int extra_perm); -#if defined(__ia64__) || defined(__x86_64__) || defined(__hppa__) || defined(__XTENSA__) +#ifndef __ARCH_WANT_IPC_PARSE_VERSION /* On IA-64, we always use the "64-bit version" of the IPC structures. */ # define ipc_parse_version(cmd) IPC_64 #else --