diff options
Diffstat (limited to 'arch/x86/kernel/traps.c')
-rw-r--r-- | arch/x86/kernel/traps.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c index 04d242ab0161..4a6dff39a470 100644 --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c | |||
@@ -72,9 +72,6 @@ | |||
72 | 72 | ||
73 | #include "cpu/mcheck/mce.h" | 73 | #include "cpu/mcheck/mce.h" |
74 | 74 | ||
75 | DECLARE_BITMAP(used_vectors, NR_VECTORS); | ||
76 | EXPORT_SYMBOL_GPL(used_vectors); | ||
77 | |||
78 | asmlinkage int system_call(void); | 75 | asmlinkage int system_call(void); |
79 | 76 | ||
80 | /* Do we ignore FPU interrupts ? */ | 77 | /* Do we ignore FPU interrupts ? */ |
@@ -89,6 +86,9 @@ gate_desc idt_table[256] | |||
89 | __attribute__((__section__(".data.idt"))) = { { { { 0, 0 } } }, }; | 86 | __attribute__((__section__(".data.idt"))) = { { { { 0, 0 } } }, }; |
90 | #endif | 87 | #endif |
91 | 88 | ||
89 | DECLARE_BITMAP(used_vectors, NR_VECTORS); | ||
90 | EXPORT_SYMBOL_GPL(used_vectors); | ||
91 | |||
92 | static int ignore_nmis; | 92 | static int ignore_nmis; |
93 | 93 | ||
94 | static inline void conditional_sti(struct pt_regs *regs) | 94 | static inline void conditional_sti(struct pt_regs *regs) |
@@ -949,9 +949,7 @@ dotraplinkage void do_iret_error(struct pt_regs *regs, long error_code) | |||
949 | 949 | ||
950 | void __init trap_init(void) | 950 | void __init trap_init(void) |
951 | { | 951 | { |
952 | #ifdef CONFIG_X86_32 | ||
953 | int i; | 952 | int i; |
954 | #endif | ||
955 | 953 | ||
956 | #ifdef CONFIG_EISA | 954 | #ifdef CONFIG_EISA |
957 | void __iomem *p = early_ioremap(0x0FFFD9, 4); | 955 | void __iomem *p = early_ioremap(0x0FFFD9, 4); |
@@ -1008,11 +1006,15 @@ void __init trap_init(void) | |||
1008 | } | 1006 | } |
1009 | 1007 | ||
1010 | set_system_trap_gate(SYSCALL_VECTOR, &system_call); | 1008 | set_system_trap_gate(SYSCALL_VECTOR, &system_call); |
1009 | #endif | ||
1011 | 1010 | ||
1012 | /* Reserve all the builtin and the syscall vector: */ | 1011 | /* Reserve all the builtin and the syscall vector: */ |
1013 | for (i = 0; i < FIRST_EXTERNAL_VECTOR; i++) | 1012 | for (i = 0; i < FIRST_EXTERNAL_VECTOR; i++) |
1014 | set_bit(i, used_vectors); | 1013 | set_bit(i, used_vectors); |
1015 | 1014 | ||
1015 | #ifdef CONFIG_X86_64 | ||
1016 | set_bit(IA32_SYSCALL_VECTOR, used_vectors); | ||
1017 | #else | ||
1016 | set_bit(SYSCALL_VECTOR, used_vectors); | 1018 | set_bit(SYSCALL_VECTOR, used_vectors); |
1017 | #endif | 1019 | #endif |
1018 | /* | 1020 | /* |