diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-08-03 11:04:00 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-08-03 11:04:00 +0200 |
| commit | f320ead76a87a9c533f681ecce3bf3241d07c47d (patch) | |
| tree | 76ae437119088b180737670cb99a307e163a1ca0 /arch/x86/kernel/Makefile | |
| parent | locking, arch: use WRITE_ONCE()/READ_ONCE() in smp_store_release()/smp_load_a... (diff) | |
| parent | x86/vm86: Rename vm86->v86flags and v86mask (diff) | |
| download | linux-f320ead76a87a9c533f681ecce3bf3241d07c47d.tar.xz linux-f320ead76a87a9c533f681ecce3bf3241d07c47d.zip | |
Merge branch 'x86/asm' into locking/core
Upcoming changes to static keys is interacting/conflicting with the following
pending TSC commits in tip:x86/asm:
4ea1636b04db x86/asm/tsc: Rename native_read_tsc() to rdtsc()
...
So merge it into the locking tree to have a smoother resolution.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/Makefile')
| -rw-r--r-- | arch/x86/kernel/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index 0f15af41bd80..514064897d55 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile @@ -23,8 +23,10 @@ KASAN_SANITIZE_dumpstack_$(BITS).o := n CFLAGS_irq.o := -I$(src)/../include/asm/trace obj-y := process_$(BITS).o signal.o +obj-$(CONFIG_COMPAT) += signal_compat.o obj-y += traps.o irq.o irq_$(BITS).o dumpstack_$(BITS).o -obj-y += time.o ioport.o ldt.o dumpstack.o nmi.o +obj-y += time.o ioport.o dumpstack.o nmi.o +obj-$(CONFIG_MODIFY_LDT_SYSCALL) += ldt.o obj-y += setup.o x86_init.o i8259.o irqinit.o jump_label.o obj-$(CONFIG_IRQ_WORK) += irq_work.o obj-y += probe_roms.o |