diff options
author | Borislav Petkov <bp@suse.de> | 2021-03-31 19:04:19 +0300 |
---|---|---|
committer | Borislav Petkov <bp@suse.de> | 2021-03-31 19:04:19 +0300 |
commit | f2ac256b9a8b7e79847efcd82bd10fd876369b9f (patch) | |
tree | 8769fa5130754ecc605df8803650293f88357879 /arch/x86/lib/retpoline.S | |
parent | 52fa82c21f64e900a72437269a5cc9e0034b424e (diff) | |
parent | 054ac8ad5ebe4a69e1f0e842483821ddbe560121 (diff) | |
download | linux-f2ac256b9a8b7e79847efcd82bd10fd876369b9f.tar.xz |
Merge 'x86/alternatives'
Pick up dependent changes.
Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'arch/x86/lib/retpoline.S')
-rw-r--r-- | arch/x86/lib/retpoline.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/lib/retpoline.S b/arch/x86/lib/retpoline.S index f6fb1d218dcc..6bb74b5c238c 100644 --- a/arch/x86/lib/retpoline.S +++ b/arch/x86/lib/retpoline.S @@ -4,7 +4,7 @@ #include <linux/linkage.h> #include <asm/dwarf2.h> #include <asm/cpufeatures.h> -#include <asm/alternative-asm.h> +#include <asm/alternative.h> #include <asm/export.h> #include <asm/nospec-branch.h> #include <asm/unwind_hints.h> |