Merge tag 'x86_shstk_for_6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / arch / x86 / kernel / Makefile

diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index 00df34c..3269a0e 100644 (file)
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -48,6 +48,7 @@ obj-y                 += process_$(BITS).o signal.o signal_$(BITS).o
 obj-y                  += traps.o idt.o irq.o irq_$(BITS).o dumpstack_$(BITS).o
 obj-y                  += time.o ioport.o dumpstack.o nmi.o
 obj-$(CONFIG_MODIFY_LDT_SYSCALL)       += ldt.o
+obj-$(CONFIG_X86_KERNEL_IBT)           += ibt_selftest.o
 obj-y                  += setup.o x86_init.o i8259.o irqinit.o
 obj-$(CONFIG_JUMP_LABEL)       += jump_label.o
 obj-$(CONFIG_IRQ_WORK)  += irq_work.o
@@ -144,6 +145,10 @@ obj-$(CONFIG_CFI_CLANG)                    += cfi.o
 
 obj-$(CONFIG_CALL_THUNKS)              += callthunks.o
 
+obj-$(CONFIG_X86_CET)                  += cet.o
+
+obj-$(CONFIG_X86_USER_SHADOW_STACK)    += shstk.o
+
 ###
 # 64 bit specific files
 ifeq ($(CONFIG_X86_64),y)