| Message ID | 20191114051510.17037-2-takahiro.akashi@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | arm64: kexec_file: add kdump | expand |
Hi Akashi, On 11/14/2019 10:45 AM, AKASHI Takahiro wrote: > In the implementation of kexec_file_load-based kdump for arm64, > fdt_appendprop_addrrange() will be used, but fdt_addresses.c > will fail to compile due to missing UINT32_MAX. > > So just define it in libfdt_env.h. > > Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org> > Cc: Rob Herring <robh+dt@kernel.org> > Cc: Frank Rowand <frowand.list@gmail.com> > --- > include/linux/libfdt_env.h | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/include/linux/libfdt_env.h b/include/linux/libfdt_env.h > index edb0f0c30904..9ca00f11d9b1 100644 > --- a/include/linux/libfdt_env.h > +++ b/include/linux/libfdt_env.h > @@ -3,6 +3,7 @@ > #define LIBFDT_ENV_H > > #include <linux/kernel.h> /* For INT_MAX */ > +#include <linux/limits.h> /* For UINT32_MAX */ > #include <linux/string.h> > > #include <asm/byteorder.h> > @@ -11,6 +12,8 @@ typedef __be16 fdt16_t; > typedef __be32 fdt32_t; > typedef __be64 fdt64_t; > > +#define UINT32_MAX U32_MAX > + > #define fdt32_to_cpu(x) be32_to_cpu(x) > #define cpu_to_fdt32(x) cpu_to_be32(x) > #define fdt64_to_cpu(x) be64_to_cpu(x) > With following upstream patches accepted already in Linus's tree (see [0] and [1]), so we can drop this patch from the v3: [0] 26ed19adbab1 ("libfdt: reduce the number of headers included from libfdt_env.h") [1] a8de1304b7df ("libfdt: define INT32_MAX and UINT32_MAX in libfdt_env.h") Thanks, Bhupesh
diff --git a/include/linux/libfdt_env.h b/include/linux/libfdt_env.h index edb0f0c30904..9ca00f11d9b1 100644 --- a/include/linux/libfdt_env.h +++ b/include/linux/libfdt_env.h @@ -3,6 +3,7 @@ #define LIBFDT_ENV_H #include <linux/kernel.h> /* For INT_MAX */ +#include <linux/limits.h> /* For UINT32_MAX */ #include <linux/string.h> #include <asm/byteorder.h> @@ -11,6 +12,8 @@ typedef __be16 fdt16_t; typedef __be32 fdt32_t; typedef __be64 fdt64_t; +#define UINT32_MAX U32_MAX + #define fdt32_to_cpu(x) be32_to_cpu(x) #define cpu_to_fdt32(x) cpu_to_be32(x) #define fdt64_to_cpu(x) be64_to_cpu(x)
In the implementation of kexec_file_load-based kdump for arm64, fdt_appendprop_addrrange() will be used, but fdt_addresses.c will fail to compile due to missing UINT32_MAX. So just define it in libfdt_env.h. Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org> Cc: Rob Herring <robh+dt@kernel.org> Cc: Frank Rowand <frowand.list@gmail.com> --- include/linux/libfdt_env.h | 3 +++ 1 file changed, 3 insertions(+) -- 2.21.0