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 <asm-generic/int-ll64.h> needs to be protected by #ifndef __KERNEL__. Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx> Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx> Cc: Paul Mackerras <paulus@xxxxxxxxx> Cc: linuxppc-dev@xxxxxxxxxxxxxxxx --- 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 <asm-generic/int-ll64.h> #include <uapi/asm/types.h> #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 <asm-generic/int-l64.h> #else # include <asm-generic/int-ll64.h> #endif +#endif #ifndef __ASSEMBLY__ -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-arch" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
