x86/mm: Add support to make use of Secure Memory Encryption

[mirror_ubuntu-bionic-kernel.git] / arch / x86 / kernel / head64.c

diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
index 0cdb53bf4c4ba4f939a2144f0abf09f47aecae56..925b2928f377935333d7b115e3662cfec3d016df 100644 (file)
--- a/arch/x86/kernel/head64.c
+++ b/arch/x86/kernel/head64.c
@@ -45,7 +45,8 @@ static void __head *fixup_pointer(void *ptr, unsigned long physaddr)
        return ptr - (void *)_text + (void *)physaddr;
 }
 
-unsigned long __head __startup_64(unsigned long physaddr)
+unsigned long __head __startup_64(unsigned long physaddr,
+                                 struct boot_params *bp)
 {
        unsigned long load_delta, *p;
        unsigned long pgtable_flags;
@@ -70,7 +71,7 @@ unsigned long __head __startup_64(unsigned long physaddr)
                for (;;);
 
        /* Activate Secure Memory Encryption (SME) if supported and enabled */
-       sme_enable();
+       sme_enable(bp);
 
        /* Include the SME encryption mask in the fixup value */
        load_delta += sme_get_me_mask();