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

[tomoyo/tomoyo-test1.git] / arch / x86 / kernel / idt.c

diff --git a/arch/x86/kernel/idt.c b/arch/x86/kernel/idt.c
index f395826..b786d48 100644 (file)
--- a/arch/x86/kernel/idt.c
+++ b/arch/x86/kernel/idt.c
@@ -107,7 +107,7 @@ static const __initconst struct idt_data def_idts[] = {
        ISTG(X86_TRAP_MC,               asm_exc_machine_check, IST_INDEX_MCE),
 #endif
 
-#ifdef CONFIG_X86_KERNEL_IBT
+#ifdef CONFIG_X86_CET
        INTG(X86_TRAP_CP,               asm_exc_control_protection),
 #endif