From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from winston.telenet-ops.be (winston.telenet-ops.be [195.130.137.75]) by ozlabs.org (Postfix) with ESMTP id 1190A2C012E for ; Mon, 25 Nov 2013 19:55:52 +1100 (EST) Received: from gerard.telenet-ops.be (gerard.telenet-ops.be [195.130.132.48]) by winston.telenet-ops.be (Postfix) with ESMTP id C43D1590AD9 for ; Mon, 25 Nov 2013 09:55:47 +0100 (CET) From: Geert Uytterhoeven To: Arnd Bergmann , linux-arch@vger.kernel.org Subject: [PATCH 21/24] powerpc: Separate kernel/userspace inclusion of Date: Mon, 25 Nov 2013 09:55:31 +0100 Message-Id: <1385369734-24893-22-git-send-email-geert@linux-m68k.org> In-Reply-To: <1385369734-24893-1-git-send-email-geert@linux-m68k.org> References: <1385369734-24893-1-git-send-email-geert@linux-m68k.org> Cc: linuxppc-dev@lists.ozlabs.org, Geert Uytterhoeven , linux-kernel@vger.kernel.org, Paul Mackerras List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , This allows to rename the kernelspace version later. Now arch/powerpc/include/asm/types.h includes the kernelspace version, while arch/powerpc/include/uapi/asm/types.h includes the userspace version. As arch/powerpc/include/uapi/asm/types.h is also included for kernelspace, its inclusion of needs to be protected by #ifndef __KERNEL__. Signed-off-by: Geert Uytterhoeven Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: linuxppc-dev@lists.ozlabs.org --- arch/powerpc/include/asm/types.h | 1 + arch/powerpc/include/uapi/asm/types.h | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/include/asm/types.h b/arch/powerpc/include/asm/types.h index bfb6ded38ffa..4b9c3530bb12 100644 --- a/arch/powerpc/include/asm/types.h +++ b/arch/powerpc/include/asm/types.h @@ -13,6 +13,7 @@ #ifndef _ASM_POWERPC_TYPES_H #define _ASM_POWERPC_TYPES_H +#include #include #ifndef __ASSEMBLY__ diff --git a/arch/powerpc/include/uapi/asm/types.h b/arch/powerpc/include/uapi/asm/types.h index 4b8ab990a3c1..7f8847b61d03 100644 --- a/arch/powerpc/include/uapi/asm/types.h +++ b/arch/powerpc/include/uapi/asm/types.h @@ -21,11 +21,13 @@ * However, some user programs are fine with this. They can * flag __SANE_USERSPACE_TYPES__ to get int-ll64.h here. */ -#if !defined(__SANE_USERSPACE_TYPES__) && defined(__powerpc64__) && !defined(__KERNEL__) +#ifndef __KERNEL__ +#if !defined(__SANE_USERSPACE_TYPES__) && defined(__powerpc64__) # include #else # include #endif +#endif #ifndef __ASSEMBLY__ -- 1.7.9.5