diff options
| author | Juergen Gross <[email protected]> | 2021-03-11 15:23:06 +0100 |
|---|---|---|
| committer | Borislav Petkov <[email protected]> | 2021-03-11 15:58:02 +0100 |
| commit | 5e21a3ecad1500e35b46701e7f3f232e15d78e69 (patch) | |
| tree | c69a1af7ba1c4fdde714b191f59d1c6dd0f71a9f /arch/x86/entry/entry_32.S | |
| parent | db16e07269c2b4346e4332e43f04e447ef14fd2f (diff) | |
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 <[email protected]>
Signed-off-by: Borislav Petkov <[email protected]>
Link: https://lkml.kernel.org/r/[email protected]
Diffstat (limited to 'arch/x86/entry/entry_32.S')
| -rw-r--r-- | arch/x86/entry/entry_32.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S index df8c017e6161..4e079f250962 100644 --- a/arch/x86/entry/entry_32.S +++ b/arch/x86/entry/entry_32.S @@ -40,7 +40,7 @@ #include <asm/processor-flags.h> #include <asm/irq_vectors.h> #include <asm/cpufeatures.h> -#include <asm/alternative-asm.h> +#include <asm/alternative.h> #include <asm/asm.h> #include <asm/smap.h> #include <asm/frame.h> |