This allows to rename the kernelspace version later. Now arch/xtensa/include/asm/types.h includes the kernelspace version, while arch/xtensa/include/uapi/asm/types.h includes the userspace version. As arch/xtensa/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 <ge...@linux-m68k.org> Cc: Chris Zankel <ch...@zankel.net> Cc: Max Filippov <jcmvb...@gmail.com> Cc: linux-xte...@linux-xtensa.org --- arch/xtensa/include/asm/types.h | 1 + arch/xtensa/include/uapi/asm/types.h | 2 ++ 2 files changed, 3 insertions(+) diff --git a/arch/xtensa/include/asm/types.h b/arch/xtensa/include/asm/types.h index 44f411c75837..d873cb17d944 100644 --- a/arch/xtensa/include/asm/types.h +++ b/arch/xtensa/include/asm/types.h @@ -10,6 +10,7 @@ #ifndef _XTENSA_TYPES_H #define _XTENSA_TYPES_H +#include <asm-generic/int-ll64.h> #include <uapi/asm/types.h> #endif /* _XTENSA_TYPES_H */ diff --git a/arch/xtensa/include/uapi/asm/types.h b/arch/xtensa/include/uapi/asm/types.h index 87ec7ae73cb1..5340b9fdb395 100644 --- a/arch/xtensa/include/uapi/asm/types.h +++ b/arch/xtensa/include/uapi/asm/types.h @@ -11,7 +11,9 @@ #ifndef _UAPI_XTENSA_TYPES_H #define _UAPI_XTENSA_TYPES_H +#ifndef __KERNEL__ #include <asm-generic/int-ll64.h> +#endif #ifdef __ASSEMBLY__ # define __XTENSA_UL(x) (x) -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
