diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-09-25 10:45:32 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-25 10:47:00 +0200 |
| commit | 704daf55c7297e727021063cb5d8ba1c55b84426 (patch) | |
| tree | 15e7b49c69f1ba742ec5fb3a009e51e1564d6a75 /arch/x86/kernel/traps.c | |
| parent | x86: Remove redundant non-NUMA topology functions (diff) | |
| parent | x86: Cleanup linker script using new linker script macros. (diff) | |
| download | linux-dev-704daf55c7297e727021063cb5d8ba1c55b84426.tar.xz linux-dev-704daf55c7297e727021063cb5d8ba1c55b84426.zip | |
Merge branch 'x86/asm' into x86/urgent
Merge reason: The linker script cleanups are ready for upstream.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/traps.c')
| -rw-r--r-- | arch/x86/kernel/traps.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c index 9346e102338d..8351175172e1 100644 --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c @@ -73,11 +73,9 @@ char ignore_fpu_irq; /* * The IDT has to be page-aligned to simplify the Pentium - * F0 0F bug workaround.. We have a special link segment - * for this. + * F0 0F bug workaround. */ -gate_desc idt_table[NR_VECTORS] - __attribute__((__section__(".data.idt"))) = { { { { 0, 0 } } }, }; +gate_desc idt_table[NR_VECTORS] __page_aligned_data = { { { { 0, 0 } } }, }; #endif DECLARE_BITMAP(used_vectors, NR_VECTORS); |