diff options
| author | Masahiro Yamada <masahiroy@kernel.org> | 2022-07-25 11:08:12 +0900 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2022-07-25 10:32:32 +0200 |
| commit | 2d17bd24b0169d3fdbf003dfd55af600e9a30553 (patch) | |
| tree | 2db57e29d2a0658133645786e030966aba439c72 /arch/x86/purgatory | |
| parent | 61922d3fa686733e08387a8a4e11b02b4af6d43c (diff) | |
| download | linux-2d17bd24b0169d3fdbf003dfd55af600e9a30553.tar.gz linux-2d17bd24b0169d3fdbf003dfd55af600e9a30553.tar.bz2 linux-2d17bd24b0169d3fdbf003dfd55af600e9a30553.zip | |
x86/purgatory: Omit use of bin2c
The .incbin assembler directive is much faster than bin2c + $(CC).
Do similar refactoring as in
4c0f032d4963 ("s390/purgatory: Omit use of bin2c").
Please note the .quad directive matches to size_t in C (both 8
byte) because the purgatory is compiled only for the 64-bit kernel.
(KEXEC_FILE depends on X86_64).
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lore.kernel.org/r/20220725020812.622255-2-masahiroy@kernel.org
Diffstat (limited to 'arch/x86/purgatory')
| -rw-r--r-- | arch/x86/purgatory/Makefile | 8 | ||||
| -rw-r--r-- | arch/x86/purgatory/kexec-purgatory.S | 14 |
2 files changed, 15 insertions, 7 deletions
diff --git a/arch/x86/purgatory/Makefile b/arch/x86/purgatory/Makefile index 248b009c4061..31c634a22818 100644 --- a/arch/x86/purgatory/Makefile +++ b/arch/x86/purgatory/Makefile @@ -73,12 +73,6 @@ $(obj)/purgatory.ro: $(PURGATORY_OBJS) FORCE $(obj)/purgatory.chk: $(obj)/purgatory.ro FORCE $(call if_changed,ld) -targets += kexec-purgatory.c - -quiet_cmd_bin2c = BIN2C $@ - cmd_bin2c = $(objtree)/scripts/bin2c kexec_purgatory < $< > $@ - -$(obj)/kexec-purgatory.c: $(obj)/purgatory.ro $(obj)/purgatory.chk FORCE - $(call if_changed,bin2c) +$(obj)/kexec-purgatory.o: $(obj)/purgatory.ro $(obj)/purgatory.chk obj-y += kexec-purgatory.o diff --git a/arch/x86/purgatory/kexec-purgatory.S b/arch/x86/purgatory/kexec-purgatory.S new file mode 100644 index 000000000000..8530fe93b718 --- /dev/null +++ b/arch/x86/purgatory/kexec-purgatory.S @@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + + .section .rodata, "a" + + .align 8 +kexec_purgatory: + .globl kexec_purgatory + .incbin "arch/x86/purgatory/purgatory.ro" +.Lkexec_purgatory_end: + + .align 8 +kexec_purgatory_size: + .globl kexec_purgatory_size + .quad .Lkexec_purgatory_end - kexec_purgatory |