Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1721121

[patch V3 28/44] x86/idt: Create file for IDT related code

Show all headers | View raw

IDT related code lives in different places. Create a new source file to
hold it.

Move the idt_tables and descriptors to it for a start. Follow up patches
will gradually move more code over.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 arch/x86/kernel/Makefile     |    2 +-
 arch/x86/kernel/cpu/common.c |    9 ---------
 arch/x86/kernel/idt.c        |   26 ++++++++++++++++++++++++++
 arch/x86/kernel/traps.c      |    6 ------
 4 files changed, 27 insertions(+), 16 deletions(-)

--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -42,7 +42,7 @@ CFLAGS_irq.o := -I$(src)/../include/asm/
 
 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			+= 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-y			+= setup.o x86_init.o i8259.o irqinit.o jump_label.o
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -1289,15 +1289,6 @@ static __init int setup_disablecpuid(cha
 __setup("clearcpuid=", setup_disablecpuid);
 
 #ifdef CONFIG_X86_64
-struct desc_ptr idt_descr __ro_after_init = {
-	.size = NR_VECTORS * 16 - 1,
-	.address = (unsigned long) idt_table,
-};
-const struct desc_ptr debug_idt_descr = {
-	.size = NR_VECTORS * 16 - 1,
-	.address = (unsigned long) debug_idt_table,
-};
-
 DEFINE_PER_CPU_FIRST(union irq_stack_union,
 		     irq_stack_union) __aligned(PAGE_SIZE) __visible;
 
--- /dev/null
+++ b/arch/x86/kernel/idt.c
@@ -0,0 +1,26 @@
+/*
+ * Interrupt descriptor table related code
+ *
+ * This file is licensed under the GPL V2
+ */
+#include <linux/interrupt.h>
+
+#include <asm/desc.h>
+
+/* Must be page-aligned because the real IDT is used in a fixmap. */
+gate_desc idt_table[IDT_ENTRIES] __page_aligned_bss;
+
+#ifdef CONFIG_X86_64
+/* No need to be aligned, but done to keep all IDTs defined the same way. */
+gate_desc debug_idt_table[IDT_ENTRIES] __page_aligned_bss;
+
+struct desc_ptr idt_descr __ro_after_init = {
+	.size		= IDT_ENTRIES * 16 - 1,
+	.address	= (unsigned long) idt_table,
+};
+
+const struct desc_ptr debug_idt_descr = {
+	.size		= IDT_ENTRIES * 16 - 1,
+	.address	= (unsigned long) debug_idt_table,
+};
+#endif
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -65,18 +65,12 @@
 #include <asm/x86_init.h>
 #include <asm/pgalloc.h>
 #include <asm/proto.h>
-
-/* No need to be aligned, but done to keep all IDTs defined the same way. */
-gate_desc debug_idt_table[NR_VECTORS] __page_aligned_bss;
 #else
 #include <asm/processor-flags.h>
 #include <asm/setup.h>
 #include <asm/proto.h>
 #endif
 
-/* Must be page-aligned because the real IDT is used in a fixmap. */
-gate_desc idt_table[NR_VECTORS] __page_aligned_bss;
-
 DECLARE_BITMAP(used_vectors, NR_VECTORS);
 
 static inline void cond_local_irq_enable(struct pt_regs *regs)

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[patch V3 00/44] x86: Cleanup IDT code Thomas Gleixner <tglx@linutronix.de> - 2017-08-28 09:10 +0200
  [patch V3 13/44] x86/mce: Remove duplicated tracing interrupt code Thomas Gleixner <tglx@linutronix.de> - 2017-08-28 09:10 +0200
    [tip:x86/apic] x86/mce: Remove duplicated tracing interrupt code tip-bot for Thomas Gleixner <tipbot@zytor.com> - 2017-08-29 13:20 +0200
  [patch V3 05/44] x86/boot: Move EISA setup to a proper place Thomas Gleixner <tglx@linutronix.de> - 2017-08-28 09:10 +0200
    [tip:x86/apic] x86/boot: Move EISA setup to a separate file tip-bot for Thomas Gleixner <tipbot@zytor.com> - 2017-08-29 13:20 +0200
  [patch V3 15/44] x86/smp: Use static key for reschedule interrupt  tracing Thomas Gleixner <tglx@linutronix.de> - 2017-08-28 09:10 +0200
    [tip:x86/apic] x86/smp: Use static key for reschedule interrupt  tracing tip-bot for Thomas Gleixner <tipbot@zytor.com> - 2017-08-29 13:20 +0200
  [patch V3 12/44] x86/irqwork: Get rid of duplicated tracing interrupt  code Thomas Gleixner <tglx@linutronix.de> - 2017-08-28 09:10 +0200
    [tip:x86/apic] x86/irqwork: Get rid of duplicated tracing interrupt  code tip-bot for Thomas Gleixner <tipbot@zytor.com> - 2017-08-29 13:20 +0200
  [patch V3 10/44] x86/irq: Get rid of duplicated  trace_x86_platform_ipi() code Thomas Gleixner <tglx@linutronix.de> - 2017-08-28 09:10 +0200
    [tip:x86/apic] x86/irq: Get rid of duplicated  trace_x86_platform_ipi() code tip-bot for Thomas Gleixner <tipbot@zytor.com> - 2017-08-29 13:20 +0200
  [patch V3 06/44] x86/tracing: Introduce a static key for exception  tracing Thomas Gleixner <tglx@linutronix.de> - 2017-08-28 09:10 +0200
    [tip:x86/apic] x86/tracing: Introduce a static key for exception  tracing tip-bot for Thomas Gleixner <tipbot@zytor.com> - 2017-08-29 13:20 +0200
  [patch V3 08/44] x86/apic: Remove the duplicated tracing version of  local_timer_interrupt Thomas Gleixner <tglx@linutronix.de> - 2017-08-28 09:10 +0200
    [tip:x86/apic] x86/apic: Remove the duplicated tracing version of  local_timer_interrupt() tip-bot for Thomas Gleixner <tipbot@zytor.com> - 2017-08-29 13:20 +0200
  [patch V3 14/44] x86/smp: Remove pointless duplicated interrupt code Thomas Gleixner <tglx@linutronix.de> - 2017-08-28 09:10 +0200
    [tip:x86/apic] x86/smp: Remove pointless duplicated interrupt code tip-bot for Thomas Gleixner <tipbot@zytor.com> - 2017-08-29 13:20 +0200
  [patch V3 04/44] x86/irq: Remove duplicated used_vectors definition Thomas Gleixner <tglx@linutronix.de> - 2017-08-28 09:10 +0200
    [tip:x86/apic] x86/irq: Remove duplicated used_vectors definition tip-bot for Thomas Gleixner <tipbot@zytor.com> - 2017-08-29 13:20 +0200
  [patch V3 03/44] x86/irq: Get rid of the first_system_vector bogisity Thomas Gleixner <tglx@linutronix.de> - 2017-08-28 09:10 +0200
    [tip:x86/apic] x86/irq: Get rid of the 'first_system_vector'  indirection bogosity tip-bot for Thomas Gleixner <tipbot@zytor.com> - 2017-08-29 13:20 +0200
  [patch V3 28/44] x86/idt: Create file for IDT related code Thomas Gleixner <tglx@linutronix.de> - 2017-08-28 09:10 +0200
    [tip:x86/apic] x86/idt: Create file for IDT related code tip-bot for Thomas Gleixner <tipbot@zytor.com> - 2017-08-29 13:30 +0200

csiph-web