diff options
| author | Ingo Molnar | 2017-11-08 10:55:48 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2017-11-08 10:55:48 +0100 |
| commit | 93c08089c06da402394605223b4faa73fe3730d2 (patch) | |
| tree | 77d033546c3172a6d09d85b50005213f1d4884de /arch/x86/lib/Makefile | |
| parent | resource: Fix resource_size.cocci warnings (diff) | |
| parent | x86/insn-eval: Extend get_seg_base_addr() to also obtain segment limit (diff) | |
| download | kernel-qcow2-linux-93c08089c06da402394605223b4faa73fe3730d2.tar.gz kernel-qcow2-linux-93c08089c06da402394605223b4faa73fe3730d2.tar.xz kernel-qcow2-linux-93c08089c06da402394605223b4faa73fe3730d2.zip | |
Merge branch 'x86/mpx' into x86/asm, to pick up dependent commits
The UMIP series is based on top of changes already queued up in the x86/mpx branch,
so merge it.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/lib/Makefile')
| -rw-r--r-- | arch/x86/lib/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile index 457f681ef379..7b181b61170e 100644 --- a/arch/x86/lib/Makefile +++ b/arch/x86/lib/Makefile @@ -24,7 +24,7 @@ lib-y := delay.o misc.o cmdline.o cpu.o lib-y += usercopy_$(BITS).o usercopy.o getuser.o putuser.o lib-y += memcpy_$(BITS).o lib-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem.o -lib-$(CONFIG_INSTRUCTION_DECODER) += insn.o inat.o +lib-$(CONFIG_INSTRUCTION_DECODER) += insn.o inat.o insn-eval.o lib-$(CONFIG_RANDOMIZE_BASE) += kaslr.o obj-y += msr.o msr-reg.o msr-reg-export.o hweight.o |