aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/traps.c6
-rw-r--r--arch/x86/kernel/vmlinux.lds.S1
2 files changed, 2 insertions, 5 deletions
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
index 83264922a878..ea23d3b76f95 100644
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -73,11 +73,9 @@ char ignore_fpu_irq;
73 73
74/* 74/*
75 * The IDT has to be page-aligned to simplify the Pentium 75 * The IDT has to be page-aligned to simplify the Pentium
76 * F0 0F bug workaround.. We have a special link segment 76 * F0 0F bug workaround.
77 * for this.
78 */ 77 */
79gate_desc idt_table[NR_VECTORS] 78gate_desc idt_table[NR_VECTORS] __page_aligned_data = { { { { 0, 0 } } }, };
80 __attribute__((__section__(".data.idt"))) = { { { { 0, 0 } } }, };
81#endif 79#endif
82 80
83DECLARE_BITMAP(used_vectors, NR_VECTORS); 81DECLARE_BITMAP(used_vectors, NR_VECTORS);
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index 5c7826dd804b..7d6cef363c47 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -112,7 +112,6 @@ SECTIONS
112#endif 112#endif
113 113
114 PAGE_ALIGNED_DATA(PAGE_SIZE) 114 PAGE_ALIGNED_DATA(PAGE_SIZE)
115 *(.data.idt)
116 115
117 CACHELINE_ALIGNED_DATA(CONFIG_X86_L1_CACHE_BYTES) 116 CACHELINE_ALIGNED_DATA(CONFIG_X86_L1_CACHE_BYTES)
118 117