diff options
| author | David S. Miller <davem@davemloft.net> | 2018-01-17 00:00:25 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-17 00:10:42 -0500 |
| commit | c02b3741eb99a1ec733e6134c53ba59e43e19e97 (patch) | |
| tree | ff7dd96c32dec2abe530e7101378443dabcb8962 /arch/x86/lib/Makefile | |
| parent | 7018d1b3f20fb4308ed9bc577160cb8ffb79b62a (diff) | |
| parent | 8cbab92dff778e516064c13113ca15d4869ec883 (diff) | |
| download | op-kernel-dev-c02b3741eb99a1ec733e6134c53ba59e43e19e97.zip op-kernel-dev-c02b3741eb99a1ec733e6134c53ba59e43e19e97.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Overlapping changes all over.
The mini-qdisc bits were a little bit tricky, however.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/x86/lib/Makefile')
| -rw-r--r-- | arch/x86/lib/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile index 171377b..25a972c 100644 --- 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_FUNCTION_ERROR_INJECTION) += error-inject.o +lib-$(CONFIG_RETPOLINE) += retpoline.o obj-y += msr.o msr-reg.o msr-reg-export.o hweight.o |
