lkml.org 
[lkml]   [2019]   [Nov]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 087/222] libfdt: Ensure INT_MAX is defined in libfdt_env.h
    Date
    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 17ae0f3efac8e..005bf4ff1b4cb 100644
    --- a/arch/arm/boot/compressed/libfdt_env.h
    +++ b/arch/arm/boot/compressed/libfdt_env.h
    @@ -5,6 +5,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 7e3789ea396b8..0b3db6322c793 100644
    --- a/arch/powerpc/boot/libfdt_env.h
    +++ b/arch/powerpc/boot/libfdt_env.h
    @@ -4,6 +4,8 @@
    #include <types.h>
    #include <string.h>

    +#define INT_MAX ((int)(~0U>>1))
    +
    #include "of.h"

    typedef u32 uint32_t;
    diff --git a/include/linux/libfdt_env.h b/include/linux/libfdt_env.h
    index 2a663c6bb4285..8850e243c9406 100644
    --- a/include/linux/libfdt_env.h
    +++ b/include/linux/libfdt_env.h
    @@ -1,6 +1,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


    \
     
     \ /
      Last update: 2019-11-22 12:23    [W:2.104 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site