lkml.org 
[lkml]   [2018]   [Feb]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.15 04/64] MIPS: boot: Define __ASSEMBLY__ for its.S build
    Date
    4.15-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Kees Cook <keescook@chromium.org>

    commit 0f9da844d87796ac31b04e81ee95e155e9043132 upstream.

    The MIPS %.its.S compiler command did not define __ASSEMBLY__, which meant
    when compiler_types.h was added to kconfig.h, unexpected things appeared
    (e.g. struct declarations) which should not have been present. As done in
    the general %.S compiler command, __ASSEMBLY__ is now included here too.

    The failure was:

    Error: arch/mips/boot/vmlinux.gz.its:201.1-2 syntax error
    FATAL ERROR: Unable to parse input tree
    /usr/bin/mkimage: Can't read arch/mips/boot/vmlinux.gz.itb.tmp: Invalid argument
    /usr/bin/mkimage Can't add hashes to FIT blob

    Reported-by: kbuild test robot <lkp@intel.com>
    Fixes: 28128c61e08e ("kconfig.h: Include compiler types to avoid missed struct attributes")
    Signed-off-by: Kees Cook <keescook@chromium.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/mips/boot/Makefile | 1 +
    1 file changed, 1 insertion(+)

    --- a/arch/mips/boot/Makefile
    +++ b/arch/mips/boot/Makefile
    @@ -126,6 +126,7 @@ $(obj)/vmlinux.its.S: $(addprefix $(srct

    quiet_cmd_cpp_its_S = ITS $@
    cmd_cpp_its_S = $(CPP) $(cpp_flags) -P -C -o $@ $< \
    + -D__ASSEMBLY__ \
    -DKERNEL_NAME="\"Linux $(KERNELRELEASE)\"" \
    -DVMLINUX_BINARY="\"$(3)\"" \
    -DVMLINUX_COMPRESSION="\"$(2)\"" \

    \
     
     \ /
      Last update: 2018-02-26 21:41    [W:4.009 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site