Skip to contentSkip to conversation

Patch "MIPS: boot: Define __ASSEMBLY__ for its.S build" has been added to the 4.14-stable tree

PATCH [email protected] 1 participant 1 message Feb 26, 2018

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

MIPS: boot: Define __ASSEMBLY__ for its.S build

to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
mips-boot-define-__assembly__-for-its.s-build.patch
and it can be found in the queue-4.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 0f9da844d87796ac31b04e81ee95e155e9043132 Mon Sep 17 00:00:00 2001

From: Kees Cook <[email protected]>
Date: Thu, 22 Feb 2018 16:59:26 -0800
Subject: MIPS: boot: Define __ASSEMBLY__ for its.S build

From: Kees Cook <[email protected]>

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

Fixes 28128c61e08e ("kconfig.h: Include compiler types to avoid missed struct attributes")
---
 arch/mips/boot/Makefile |    1 +
 1 file changed, 1 insertion(+)
arch/mips/boot/Makefile +1 -0
@@ -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)\"" \

Patches currently in stable-queue which might be from [email protected] are

queue-4.14/mips-boot-define-__assembly__-for-its.s-build.patch queue-4.14/kconfig.h-include-compiler-types-to-avoid-missed-struct-attributes.patch