diff options
| author |   Juergen Gross <jgross@suse.com> | 2021-03-11 15:23:06 +0100 |
|---|---|---|
| committer |   Borislav Petkov <bp@suse.de> | 2021-03-11 15:58:02 +0100 |
| commit | 5e21a3ecad1500e35b46701e7f3f232e15d78e69 (patch) | |
| tree | c69a1af7ba1c4fdde714b191f59d1c6dd0f71a9f /arch/x86/include/asm/nospec-branch.h | |
| parent | x86/alternative: Drop unused feature parameter from ALTINSTR_REPLACEMENT() (diff) | |
| download | linux-dev-5e21a3ecad1500e35b46701e7f3f232e15d78e69.tar.xz linux-dev-5e21a3ecad1500e35b46701e7f3f232e15d78e69.zip | |
x86/alternative: Merge include files
Merge arch/x86/include/asm/alternative-asm.h into
arch/x86/include/asm/alternative.h in order to make it easier to use
common definitions later.
Signed-off-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20210311142319.4723-2-jgross@suse.com
Diffstat (limited to 'arch/x86/include/asm/nospec-branch.h')
| -rw-r--r-- | arch/x86/include/asm/nospec-branch.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/include/asm/nospec-branch.h b/arch/x86/include/asm/nospec-branch.h index cb9ad6b73973..529f8e9380d8 100644 --- a/arch/x86/include/asm/nospec-branch.h +++ b/arch/x86/include/asm/nospec-branch.h @@ -7,7 +7,6 @@ #include <linux/objtool.h> #include <asm/alternative.h> -#include <asm/alternative-asm.h> #include <asm/cpufeatures.h> #include <asm/msr-index.h> #include <asm/unwind_hints.h> |