Commit 6a60df8e authored Nov 13, 2019 by Masahiro Yamada Committed by Greg Kroah-Hartman Jan 04, 2020

libfdt: define INT32_MAX and UINT32_MAX in libfdt_env.h



[ Upstream commit a8de1304b7df30e3a14f2a8b9709bb4ff31a0385 ]

The DTC v1.5.1 added references to (U)INT32_MAX.

This is no problem for user-space programs since <stdint.h> defines
(U)INT32_MAX along with (u)int32_t.

For the kernel space, libfdt_env.h needs to be adjusted before we
pull in the changes.

In the kernel, we usually use s/u32 instead of (u)int32_t for the
fixed-width types.

Accordingly, we already have S/U32_MAX for their max values.
So, we should not add (U)INT32_MAX to <linux/limits.h> any more.

Instead, add them to the in-kernel libfdt_env.h to compile the
latest libfdt.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 2d31ea6f

arch/arm/boot/compressed/libfdt_env.h

+3 −1

Original line number	Diff line number	Diff line
		#ifndef _ARM_LIBFDT_ENV_H
		#define _ARM_LIBFDT_ENV_H

		#include <linux/limits.h>
		#include <linux/types.h>
		#include <linux/string.h>
		#include <asm/byteorder.h>

		#define INT_MAX ((int)(~0U>>1))
		#define INT32_MAX S32_MAX
		#define UINT32_MAX U32_MAX

		typedef __be16 fdt16_t;
		typedef __be32 fdt32_t;

arch/powerpc/boot/libfdt_env.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -5,6 +5,8 @@
		#include <string.h>

		#define INT_MAX ((int)(~0U>>1))
		#define UINT32_MAX ((u32)~0U)
		#define INT32_MAX ((s32)(UINT32_MAX >> 1))

		#include "of.h"

include/linux/libfdt_env.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -6,6 +6,9 @@

		#include <asm/byteorder.h>

		#define INT32_MAX S32_MAX
		#define UINT32_MAX U32_MAX

		typedef __be16 fdt16_t;
		typedef __be32 fdt32_t;
		typedef __be64 fdt64_t;