x86/process: Allow runtime control of Speculative Store Bypass

[mirror_ubuntu-artful-kernel.git] / arch / x86 / kernel / relocate_kernel_64.S

diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S
index 98111b38ebfd6eb9949242c5aae7b18bbbdb4489..e789cc77dd9358d74e0fc2d6ab48bbfc6ad47ff4 100644 (file)
--- a/arch/x86/kernel/relocate_kernel_64.S
+++ b/arch/x86/kernel/relocate_kernel_64.S
@@ -11,6 +11,7 @@
 #include <asm/kexec.h>
 #include <asm/processor-flags.h>
 #include <asm/pgtable_types.h>
+#include <asm/nospec-branch.h>
 
 /*
  * Must be relocatable PIC code callable as a C function
@@ -172,6 +173,7 @@ identity_mapped:
 1:
        popq    %rdx
        leaq    PAGE_SIZE(%r10), %rsp
+       ANNOTATE_RETPOLINE_SAFE
        call    *%rdx
 
        /* get the re-entry point of the peer system */