git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'x86_cleanups_for_v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
include
/
asm
/
nospec-branch.h
diff --git
a/arch/x86/include/asm/nospec-branch.h
b/arch/x86/include/asm/nospec-branch.h
index d83ea9e5db47e73fa91ff7cbdb57aa35fb74c8d3..c14fb80b9a07a47db41883ad37acef172ede8787 100644
(file)
--- 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>