| From 8fd528e74ecb19a831a48e6a9717c3535d9bfcf4 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 13 Sep 2018 15:16:22 -0500 |
| Subject: libfdt: Ensure INT_MAX is defined in libfdt_env.h |
| |
| From: Rob Herring <robh@kernel.org> |
| |
| [ Upstream commit 53dd9dce6979bc54d64a3a09a2fb20187a025be7 ] |
| |
| The next update of libfdt has a new dependency on INT_MAX. Update the |
| instances of libfdt_env.h in the kernel to either include the necessary |
| header with the definition or define it locally. |
| |
| Cc: Russell King <linux@armlinux.org.uk> |
| Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> |
| Cc: Paul Mackerras <paulus@samba.org> |
| Cc: Michael Ellerman <mpe@ellerman.id.au> |
| Cc: linux-arm-kernel@lists.infradead.org |
| Cc: linuxppc-dev@lists.ozlabs.org |
| Signed-off-by: Rob Herring <robh@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/arm/boot/compressed/libfdt_env.h | 2 ++ |
| arch/powerpc/boot/libfdt_env.h | 2 ++ |
| include/linux/libfdt_env.h | 1 + |
| 3 files changed, 5 insertions(+) |
| |
| diff --git a/arch/arm/boot/compressed/libfdt_env.h b/arch/arm/boot/compressed/libfdt_env.h |
| index 07437816e0986..b36c0289a308e 100644 |
| --- a/arch/arm/boot/compressed/libfdt_env.h |
| +++ b/arch/arm/boot/compressed/libfdt_env.h |
| @@ -6,6 +6,8 @@ |
| #include <linux/string.h> |
| #include <asm/byteorder.h> |
| |
| +#define INT_MAX ((int)(~0U>>1)) |
| + |
| typedef __be16 fdt16_t; |
| typedef __be32 fdt32_t; |
| typedef __be64 fdt64_t; |
| diff --git a/arch/powerpc/boot/libfdt_env.h b/arch/powerpc/boot/libfdt_env.h |
| index 2a0c8b1bf1479..2abc8e83b95e9 100644 |
| --- a/arch/powerpc/boot/libfdt_env.h |
| +++ b/arch/powerpc/boot/libfdt_env.h |
| @@ -5,6 +5,8 @@ |
| #include <types.h> |
| #include <string.h> |
| |
| +#define INT_MAX ((int)(~0U>>1)) |
| + |
| #include "of.h" |
| |
| typedef unsigned long uintptr_t; |
| diff --git a/include/linux/libfdt_env.h b/include/linux/libfdt_env.h |
| index c6ac1fe7ec68a..edb0f0c309044 100644 |
| --- a/include/linux/libfdt_env.h |
| +++ b/include/linux/libfdt_env.h |
| @@ -2,6 +2,7 @@ |
| #ifndef LIBFDT_ENV_H |
| #define LIBFDT_ENV_H |
| |
| +#include <linux/kernel.h> /* For INT_MAX */ |
| #include <linux/string.h> |
| |
| #include <asm/byteorder.h> |
| -- |
| 2.20.1 |
| |