This allows to rename the kernelspace version later. Now arch/s390/include/asm/types.h includes the kernelspace version, while arch/s390/include/uapi/asm/types.h includes the userspace version. As arch/s390/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: Martin Schwidefsky <schwidefsky@xxxxxxxxxx> Cc: Heiko Carstens <heiko.carstens@xxxxxxxxxx> Cc: linux-s390@xxxxxxxxxxxxxxx --- arch/s390/include/asm/types.h | 1 + arch/s390/include/uapi/asm/types.h | 2 ++ 2 files changed, 3 insertions(+) diff --git a/arch/s390/include/asm/types.h b/arch/s390/include/asm/types.h index dccef3ca91fa..a5c7e829dbc3 100644 --- a/arch/s390/include/asm/types.h +++ b/arch/s390/include/asm/types.h @@ -6,6 +6,7 @@ #ifndef _S390_TYPES_H #define _S390_TYPES_H +#include <asm-generic/int-ll64.h> #include <uapi/asm/types.h> /* diff --git a/arch/s390/include/uapi/asm/types.h b/arch/s390/include/uapi/asm/types.h index 038f2b9178a4..13b5ad14380d 100644 --- a/arch/s390/include/uapi/asm/types.h +++ b/arch/s390/include/uapi/asm/types.h @@ -7,7 +7,9 @@ #ifndef _UAPI_S390_TYPES_H #define _UAPI_S390_TYPES_H +#ifndef __KERNEL__ #include <asm-generic/int-ll64.h> +#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
