x86/alternative: Merge include files
authorJuergen Gross <jgross@suse.com>
Thu, 11 Mar 2021 14:23:06 +0000 (15:23 +0100)
committerBorislav Petkov <bp@suse.de>
Thu, 11 Mar 2021 14:58:02 +0000 (15:58 +0100)
commit5e21a3ecad1500e35b46701e7f3f232e15d78e69
treec69a1af7ba1c4fdde714b191f59d1c6dd0f71a9f
parentdb16e07269c2b4346e4332e43f04e447ef14fd2f
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
14 files changed:
arch/x86/entry/entry_32.S
arch/x86/entry/vdso/vdso32/system_call.S
arch/x86/include/asm/alternative-asm.h [deleted file]
arch/x86/include/asm/alternative.h
arch/x86/include/asm/nospec-branch.h
arch/x86/include/asm/smap.h
arch/x86/lib/atomic64_386_32.S
arch/x86/lib/atomic64_cx8_32.S
arch/x86/lib/copy_page_64.S
arch/x86/lib/copy_user_64.S
arch/x86/lib/memcpy_64.S
arch/x86/lib/memmove_64.S
arch/x86/lib/memset_64.S
arch/x86/lib/retpoline.S