diff options
author | 2016-11-17 08:30:54 +0100 | |
---|---|---|
committer | 2016-11-17 08:30:54 +0100 | |
commit | 89a01c51cbe3b6ae81008e8c91235be583df8c50 (patch) | |
tree | 0f2e42652d8ebdfc6aeaa8f7c1b5b834f4a5d649 /arch/mips/Makefile | |
parent | x86/dumpstack: Handle NULL stack pointer in show_trace_log_lvl() (diff) | |
parent | x86/cpufeatures: Enable new AVX512 cpu features (diff) | |
download | linux-dev-89a01c51cbe3b6ae81008e8c91235be583df8c50.tar.xz linux-dev-89a01c51cbe3b6ae81008e8c91235be583df8c50.zip |
Merge branch 'x86/cpufeature' into x86/asm, to pick up dependency
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/mips/Makefile')
-rw-r--r-- | arch/mips/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/Makefile b/arch/mips/Makefile index fbf40d3c8123..1a6bac7b076f 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile @@ -263,7 +263,7 @@ KBUILD_CPPFLAGS += -DDATAOFFSET=$(if $(dataoffset-y),$(dataoffset-y),0) bootvars-y = VMLINUX_LOAD_ADDRESS=$(load-y) \ VMLINUX_ENTRY_ADDRESS=$(entry-y) \ - PLATFORM=$(platform-y) + PLATFORM="$(platform-y)" ifdef CONFIG_32BIT bootvars-y += ADDR_BITS=32 endif |