lkml.org 
[lkml]   [2019]   [Dec]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.9 39/42] libfdt: define INT32_MAX and UINT32_MAX in libfdt_env.h
    Date
    From: Masahiro Yamada <yamada.masahiro@socionext.com>

    [ 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>
    ---
    arch/arm/boot/compressed/libfdt_env.h | 4 +++-
    arch/powerpc/boot/libfdt_env.h | 2 ++
    include/linux/libfdt_env.h | 3 +++
    3 files changed, 8 insertions(+), 1 deletion(-)

    diff --git a/arch/arm/boot/compressed/libfdt_env.h b/arch/arm/boot/compressed/libfdt_env.h
    index 005bf4ff1b4cb..f3ddd4f599e3e 100644
    --- a/arch/arm/boot/compressed/libfdt_env.h
    +++ b/arch/arm/boot/compressed/libfdt_env.h
    @@ -1,11 +1,13 @@
    #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;
    diff --git a/arch/powerpc/boot/libfdt_env.h b/arch/powerpc/boot/libfdt_env.h
    index 0b3db6322c793..5f2cb1c53e151 100644
    --- a/arch/powerpc/boot/libfdt_env.h
    +++ b/arch/powerpc/boot/libfdt_env.h
    @@ -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"

    diff --git a/include/linux/libfdt_env.h b/include/linux/libfdt_env.h
    index 8850e243c9406..bd0a55821177a 100644
    --- a/include/linux/libfdt_env.h
    +++ b/include/linux/libfdt_env.h
    @@ -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;
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-12-11 16:37    [W:3.478 / U:0.180 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site