x86/boot/compressed: Only build mem_encrypt.S if AMD_MEM_ENCRYPT=y

Avoid building the mem_encrypt.o object if memory encryption support is
not enabled to begin with.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lore.kernel.org/r/20221122161017.2426828-17-ardb@kernel.org

diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
index cd1a6295b957ea1d5149ba52b20047467b38453d..3dc5db651dd0a1974d24b2a41c1c7490a1db8e7b 100644 (file)
--- a/arch/x86/boot/compressed/Makefile
+++ b/arch/x86/boot/compressed/Makefile
@@ -100,7 +100,7 @@ vmlinux-objs-$(CONFIG_RANDOMIZE_BASE) += $(obj)/kaslr.o
 ifdef CONFIG_X86_64
        vmlinux-objs-y += $(obj)/ident_map_64.o
        vmlinux-objs-y += $(obj)/idt_64.o $(obj)/idt_handlers_64.o
-       vmlinux-objs-y += $(obj)/mem_encrypt.o
+       vmlinux-objs-$(CONFIG_AMD_MEM_ENCRYPT) += $(obj)/mem_encrypt.o
        vmlinux-objs-y += $(obj)/pgtable_64.o
        vmlinux-objs-$(CONFIG_AMD_MEM_ENCRYPT) += $(obj)/sev.o
 endif

diff --git a/arch/x86/boot/compressed/mem_encrypt.S b/arch/x86/boot/compressed/mem_encrypt.S
index e69674588a31c81f4ff1f78914e44299250b062f..32f7cc8a862547e426f998e14b1e3125263a408d 100644 (file)
--- a/arch/x86/boot/compressed/mem_encrypt.S
+++ b/arch/x86/boot/compressed/mem_encrypt.S
@@ -307,7 +307,6 @@ SYM_FUNC_END(startup32_check_sev_cbit)
 
        .data
 
-#ifdef CONFIG_AMD_MEM_ENCRYPT
        .balign 8
 SYM_DATA(sme_me_mask,          .quad 0)
 SYM_DATA(sev_status,           .quad 0)
@@ -323,4 +322,3 @@ SYM_DATA_START_LOCAL(boot32_idt_desc)
        .word   . - boot32_idt - 1
        .long   0
 SYM_DATA_END(boot32_idt_desc)
-#endif