diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-04-16 23:47:41 +0900 |
|---|---|---|
| committer | Paul Burton <paul.burton@mips.com> | 2018-06-24 09:27:27 -0700 |
| commit | 902b923da619b79e311fd456f78c24619d03131b (patch) | |
| tree | 39ce6d2c7ea85238c40ce5a4c3f0fa1719346918 /arch/mips/boot | |
| parent | 7896de7bd727c9269b7571cfa8dcbc9b99dfb13c (diff) | |
| download | linux-0-day-902b923da619b79e311fd456f78c24619d03131b.tar.gz linux-0-day-902b923da619b79e311fd456f78c24619d03131b.tar.xz | |
Revert "MIPS: boot: Define __ASSEMBLY__ for its.S build"
This reverts commit 0f9da844d87796ac31b04e81ee95e155e9043132.
It is true that commit 0f9da844d877 ("MIPS: boot: Define __ASSEMBLY__
for its.S build") fixed the build error, but it should not have
defined __ASSEMBLY__ just for textual substitution in arbitrary data.
The file is image tree source in this case, but the purpose of using
CPP is to replace some macros.
I merged a better solution, commit a95b37e20db9 ("kbuild: get
<linux/compiler_types.h> out of <linux/kconfig.h>"). The original
fix-up is no longer needed.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Patchwork: https://patchwork.linux-mips.org/patch/19096/
Signed-off-by: Paul Burton <paul.burton@mips.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: linux-kernel@vger.kernel.org
Diffstat (limited to 'arch/mips/boot')
| -rw-r--r-- | arch/mips/boot/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/boot/Makefile b/arch/mips/boot/Makefile index c22da16d67b82..1bd5c4f00d19b 100644 --- a/arch/mips/boot/Makefile +++ b/arch/mips/boot/Makefile @@ -126,7 +126,6 @@ $(obj)/vmlinux.its.S: $(addprefix $(srctree)/arch/mips/$(PLATFORM)/,$(ITS_INPUTS 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)\"" \ |