Merge tag 'x86-mm-2023-10-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

[linux-2.6-microblaze.git] / arch / x86 / boot / compressed / sev.c

diff --git a/arch/x86/boot/compressed/sev.c b/arch/x86/boot/compressed/sev.c
index ba4868f..454acd7 100644 (file)
--- a/arch/x86/boot/compressed/sev.c
+++ b/arch/x86/boot/compressed/sev.c
@@ -103,6 +103,16 @@ static enum es_result vc_read_mem(struct es_em_ctxt *ctxt,
        return ES_OK;
 }
 
+static enum es_result vc_ioio_check(struct es_em_ctxt *ctxt, u16 port, size_t size)
+{
+       return ES_OK;
+}
+
+static bool fault_in_kernel_space(unsigned long address)
+{
+       return false;
+}
+
 #undef __init
 #define __init
 
@@ -605,7 +615,7 @@ void sev_prep_identity_maps(unsigned long top_level_pgt)
         * accessed after switchover.
         */
        if (sev_snp_enabled()) {
-               unsigned long cc_info_pa = boot_params->cc_blob_address;
+               unsigned long cc_info_pa = boot_params_ptr->cc_blob_address;
                struct cc_blob_sev_info *cc_info;
 
                kernel_add_identity_map(cc_info_pa, cc_info_pa + sizeof(*cc_info));