arch/x86/boot/startup/map_kernel.c | 10 ++-- arch/x86/boot/startup/sme.c | 6 ++- arch/x86/include/asm/mem_encrypt.h | 14 ++---- arch/x86/include/asm/setup.h | 11 ++--- arch/x86/kernel/asm-offsets.c | 3 ++ arch/x86/kernel/head64.c | 61 ++--------------------- arch/x86/kernel/head_32.S | 4 +- arch/x86/kernel/head_64.S | 47 ++++++++++++++---- arch/x86/kernel/setup.c | 1 + arch/x86/kernel/smpboot.c | 2 +- arch/x86/kernel/vmlinux.lds.S | 2 +- arch/x86/mm/mem_encrypt_amd.c | 64 ++----------------------- arch/x86/xen/enlighten_pv.c | 4 +- arch/x86/xen/xen-head.S | 5 +- drivers/firmware/efi/libstub/x86-stub.c | 6 +-- 15 files changed, 76 insertions(+), 164 deletions(-)