diff options
author | Ross Zwisler | 2018-02-03 08:26:26 +0100 |
---|---|---|
committer | Ross Zwisler | 2018-02-03 08:26:26 +0100 |
commit | ee95f4059a833839bf52972191b2d4c3d3cec552 (patch) | |
tree | a1c8587d9b82e64a75dde376a90a3d69b0f4847a /arch/x86/lib/Makefile | |
parent | Merge branch 'for-4.16/dax' into libnvdimm-for-next (diff) | |
parent | nfit-test: Add platform cap support from ACPI 6.2a to test (diff) | |
download | kernel-qcow2-linux-ee95f4059a833839bf52972191b2d4c3d3cec552.tar.gz kernel-qcow2-linux-ee95f4059a833839bf52972191b2d4c3d3cec552.tar.xz kernel-qcow2-linux-ee95f4059a833839bf52972191b2d4c3d3cec552.zip |
Merge branch 'for-4.16/nfit' into libnvdimm-for-next
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 7b181b61170e..f23934bbaf4e 100644 --- a/arch/x86/lib/Makefile +++ b/arch/x86/lib/Makefile @@ -26,6 +26,7 @@ lib-y += memcpy_$(BITS).o 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 obj-y += msr.o msr-reg.o msr-reg-export.o hweight.o |