diff options
| author | Ingo Molnar <mingo@kernel.org> | 2020-03-21 09:23:40 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-03-21 09:24:41 +0100 |
| commit | a4654e9bde4ecedb4921e6c8fe2088114bdff1b3 (patch) | |
| tree | 1b9970b520d7bc7176cc9460fe67f210be5ea181 /arch/x86/boot/Makefile | |
| parent | 7add7875a8eb4ffe5eddaf8a11e409c9e1b6e3f3 (diff) | |
| parent | e4160b2e4b02377c67f8ecd05786811598f39acd (diff) | |
Merge branch 'x86/kdump' into locking/kcsan, to resolve conflicts
Conflicts:
arch/x86/purgatory/Makefile
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/boot/Makefile')
| -rw-r--r-- | arch/x86/boot/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile index 990090452d70..11714c4e2631 100644 --- a/arch/x86/boot/Makefile +++ b/arch/x86/boot/Makefile @@ -47,8 +47,8 @@ setup-y += video-vesa.o setup-y += video-bios.o targets += $(setup-y) -hostprogs-y := tools/build -hostprogs-$(CONFIG_X86_FEATURE_NAMES) += mkcpustr +hostprogs := tools/build +hostprogs += mkcpustr HOST_EXTRACFLAGS += -I$(srctree)/tools/include \ -include include/generated/autoconf.h \ @@ -90,7 +90,7 @@ $(obj)/vmlinux.bin: $(obj)/compressed/vmlinux FORCE SETUP_OBJS = $(addprefix $(obj)/,$(setup-y)) -sed-zoffset := -e 's/^\([0-9a-fA-F]*\) [ABCDGRSTVW] \(startup_32\|startup_64\|efi32_stub_entry\|efi64_stub_entry\|efi_pe_entry\|input_data\|kernel_info\|_end\|_ehead\|_text\|z_.*\)$$/\#define ZO_\2 0x\1/p' +sed-zoffset := -e 's/^\([0-9a-fA-F]*\) [a-zA-Z] \(startup_32\|startup_64\|efi32_stub_entry\|efi64_stub_entry\|efi_pe_entry\|input_data\|kernel_info\|_end\|_ehead\|_text\|z_.*\)$$/\#define ZO_\2 0x\1/p' quiet_cmd_zoffset = ZOFFSET $@ cmd_zoffset = $(NM) $< | sed -n $(sed-zoffset) > $@ |