Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755038AbZFTUo0 (ORCPT ); Sat, 20 Jun 2009 16:44:26 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752309AbZFTUoT (ORCPT ); Sat, 20 Jun 2009 16:44:19 -0400 Received: from hera.kernel.org ([140.211.167.34]:50694 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752096AbZFTUoS (ORCPT ); Sat, 20 Jun 2009 16:44:18 -0400 Subject: [PATCH -tip RESEND] x86: asm/unistd.h common for kernel and user space From: Jaswinder Singh Rajput To: Ingo Molnar Cc: x86 maintainers , Sam Ravnborg , LKML , Arnd Bergmann , Christoph Hellwig In-Reply-To: <1245347118.2481.13.camel@ht.satnam> References: <1245314365.31204.7.camel@ht.satnam> <1245346986.2481.10.camel@ht.satnam> <1245347082.2481.12.camel@ht.satnam> <1245347118.2481.13.camel@ht.satnam> Content-Type: text/plain Date: Sun, 21 Jun 2009 02:15:19 +0530 Message-Id: <1245530719.2459.2.camel@ht.satnam> Mime-Version: 1.0 X-Mailer: Evolution 2.24.5 (2.24.5-1.fc10) Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1069 Lines: 44 Make asm/unistd.h common for kernel and user space. Also defined _ASM_X86_UNISTD_H Signed-off-by: Jaswinder Singh Rajput --- arch/x86/include/asm/unistd.h | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/arch/x86/include/asm/unistd.h b/arch/x86/include/asm/unistd.h index 2a58ed3..0de8cb3 100644 --- a/arch/x86/include/asm/unistd.h +++ b/arch/x86/include/asm/unistd.h @@ -1,13 +1,10 @@ -#ifdef __KERNEL__ -# ifdef CONFIG_X86_32 +#ifndef _ASM_X86_UNISTD_H +#define _ASM_X86_UNISTD_H + +# if defined(CONFIG_X86_32) || defined(__i386__) # include "unistd_32.h" # else # include "unistd_64.h" # endif -#else -# ifdef __i386__ -# include "unistd_32.h" -# else -# include "unistd_64.h" -# endif -#endif + +#endif /* _ASM_X86_UNISTD_H */ -- 1.6.0.6 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/