projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v4.15' into x86/pti, to be able to merge dependent changes
[linux-2.6-block.git]
/
arch
/
x86
/
lib
/
Makefile
diff --git
a/arch/x86/lib/Makefile
b/arch/x86/lib/Makefile
index f23934bbaf4ebe6a55331669160d6b0aa72ba5d4..69a473919260bf1daa5592ac56c34f656fd3a28d 100644
(file)
--- a/
arch/x86/lib/Makefile
+++ b/
arch/x86/lib/Makefile
@@
-27,6
+27,7
@@
lib-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem.o
lib-$(CONFIG_INSTRUCTION_DECODER) += insn.o inat.o insn-eval.o
lib-$(CONFIG_RANDOMIZE_BASE) += kaslr.o
lib-$(CONFIG_RETPOLINE) += retpoline.o
+OBJECT_FILES_NON_STANDARD_retpoline.o :=y
obj-y += msr.o msr-reg.o msr-reg-export.o hweight.o