x86/idt: Move interrupt gate initialization to IDT code

Move the gate intialization from interrupt init to the IDT code so all IDT
related operations are at a single place.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/20170828064959.340209198@linutronix.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>

2 files changed, 18 insertions, 18 deletions

diff --git a/arch/x86/kernel/idt.c b/arch/x86/kernel/idt.c
index 4327104f5af8..99f93a6fb92a 100644
--- a/arch/x86/kernel/idt.c
+++ b/arch/x86/kernel/idt.c
@@ -286,7 +286,25 @@ void __init idt_setup_debugidt_traps(void)
  */
 void __init idt_setup_apic_and_irq_gates(void)
 {
+        int i = FIRST_EXTERNAL_VECTOR;
+        void *entry;
+
         idt_setup_from_table(idt_table, apic_idts, ARRAY_SIZE(apic_idts));
+
+        for_each_clear_bit_from(i, used_vectors, FIRST_SYSTEM_VECTOR) {
+                entry = irq_entries_start + 8 * (i - FIRST_EXTERNAL_VECTOR);
+                set_intr_gate(i, entry);
+        }
+
+        for_each_clear_bit_from(i, used_vectors, NR_VECTORS) {
+#ifdef CONFIG_X86_LOCAL_APIC
+                set_bit(i, used_vectors);
+                set_intr_gate(i, spurious_interrupt);
+#else
+                entry = irq_entries_start + 8 * (i - FIRST_EXTERNAL_VECTOR);
+                set_intr_gate(i, entry);
+#endif
+        }
 }
 
 /**
diff --git a/arch/x86/kernel/irqinit.c b/arch/x86/kernel/irqinit.c
index 218cd06f22f6..1add9e08e83e 100644
--- a/arch/x86/kernel/irqinit.c
+++ b/arch/x86/kernel/irqinit.c
@@ -89,29 +89,11 @@ void __init init_IRQ(void)
 
 void __init native_init_IRQ(void)
 {
-        int i;
-
         /* Execute any quirks before the call gates are initialised: */
         x86_init.irqs.pre_vector_init();
 
         idt_setup_apic_and_irq_gates();
 
-        /*
-         * Cover the whole vector space, no vector can escape
-         * us. (some of these will be overridden and become
-         * 'special' SMP interrupts)
-         */
-        i = FIRST_EXTERNAL_VECTOR;
-        for_each_clear_bit_from(i, used_vectors, FIRST_SYSTEM_VECTOR) {
-                /* IA32_SYSCALL_VECTOR could be used in trap_init already. */
-                set_intr_gate(i, irq_entries_start +
-                                8 * (i - FIRST_EXTERNAL_VECTOR));
-        }
-#ifdef CONFIG_X86_LOCAL_APIC
-        for_each_clear_bit_from(i, used_vectors, NR_VECTORS)
-                set_intr_gate(i, spurious_interrupt);
-#endif
-
         if (!acpi_ioapic && !of_ioapic && nr_legacy_irqs())
                 setup_irq(2, &irq2);