aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2018-09-13 16:16:22 -0400
committerRob Herring <robh@kernel.org>2018-09-19 18:10:06 -0400
commit53dd9dce6979bc54d64a3a09a2fb20187a025be7 (patch)
tree0a78364a17b8114909660d5fa72e7b3d223905a4
parent62287dce5d0ee207b6a09a0a1abd06b61cee1094 (diff)
libfdt: Ensure INT_MAX is defined in libfdt_env.h
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>
-rw-r--r--arch/arm/boot/compressed/libfdt_env.h2
-rw-r--r--arch/powerpc/boot/libfdt_env.h2
-rw-r--r--include/linux/libfdt_env.h1
3 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/boot/compressed/libfdt_env.h b/arch/arm/boot/compressed/libfdt_env.h
index 07437816e098..b36c0289a308 100644
--- a/arch/arm/boot/compressed/libfdt_env.h
+++ b/arch/arm/boot/compressed/libfdt_env.h
@@ -6,6 +6,8 @@
6#include <linux/string.h> 6#include <linux/string.h>
7#include <asm/byteorder.h> 7#include <asm/byteorder.h>
8 8
9#define INT_MAX ((int)(~0U>>1))
10
9typedef __be16 fdt16_t; 11typedef __be16 fdt16_t;
10typedef __be32 fdt32_t; 12typedef __be32 fdt32_t;
11typedef __be64 fdt64_t; 13typedef __be64 fdt64_t;
diff --git a/arch/powerpc/boot/libfdt_env.h b/arch/powerpc/boot/libfdt_env.h
index 2a0c8b1bf147..2abc8e83b95e 100644
--- a/arch/powerpc/boot/libfdt_env.h
+++ b/arch/powerpc/boot/libfdt_env.h
@@ -5,6 +5,8 @@
5#include <types.h> 5#include <types.h>
6#include <string.h> 6#include <string.h>
7 7
8#define INT_MAX ((int)(~0U>>1))
9
8#include "of.h" 10#include "of.h"
9 11
10typedef unsigned long uintptr_t; 12typedef unsigned long uintptr_t;
diff --git a/include/linux/libfdt_env.h b/include/linux/libfdt_env.h
index c6ac1fe7ec68..edb0f0c30904 100644
--- a/include/linux/libfdt_env.h
+++ b/include/linux/libfdt_env.h
@@ -2,6 +2,7 @@
2#ifndef LIBFDT_ENV_H 2#ifndef LIBFDT_ENV_H
3#define LIBFDT_ENV_H 3#define LIBFDT_ENV_H
4 4
5#include <linux/kernel.h> /* For INT_MAX */
5#include <linux/string.h> 6#include <linux/string.h>
6 7
7#include <asm/byteorder.h> 8#include <asm/byteorder.h>