diff options
author | Alexander van Heukelum <heukelum@fastmail.fm> | 2008-09-09 15:56:12 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-13 04:20:40 -0400 |
commit | b939bde2788a7f16741e563ee90f6f3ad38935cf (patch) | |
tree | 2cf8b19c24ef89e48f1e5f2f529826bbbd92682e /arch | |
parent | eb642f62082348c33ead53f736a9698953aa517d (diff) |
i386: convert hardware exception 19 to an interrupt gate
Handle SIMD coprocessor exception with interrupt initially off.
Signed-off-by: Alexander van Heukelum <heukelum@fastmail.fm>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/kernel/traps_32.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps_32.c index 54b89f497bac..1bd7960b1357 100644 --- a/arch/x86/kernel/traps_32.c +++ b/arch/x86/kernel/traps_32.c | |||
@@ -1144,6 +1144,8 @@ static void simd_math_error(void __user *ip) | |||
1144 | 1144 | ||
1145 | void do_simd_coprocessor_error(struct pt_regs *regs, long error_code) | 1145 | void do_simd_coprocessor_error(struct pt_regs *regs, long error_code) |
1146 | { | 1146 | { |
1147 | conditional_sti(regs); | ||
1148 | |||
1147 | if (cpu_has_xmm) { | 1149 | if (cpu_has_xmm) { |
1148 | /* Handle SIMD FPU exceptions on PIII+ processors. */ | 1150 | /* Handle SIMD FPU exceptions on PIII+ processors. */ |
1149 | ignore_fpu_irq = 1; | 1151 | ignore_fpu_irq = 1; |
@@ -1294,7 +1296,7 @@ void __init trap_init(void) | |||
1294 | #ifdef CONFIG_X86_MCE | 1296 | #ifdef CONFIG_X86_MCE |
1295 | set_intr_gate(18, &machine_check); | 1297 | set_intr_gate(18, &machine_check); |
1296 | #endif | 1298 | #endif |
1297 | set_trap_gate(19, &simd_coprocessor_error); | 1299 | set_intr_gate(19, &simd_coprocessor_error); |
1298 | 1300 | ||
1299 | if (cpu_has_fxsr) { | 1301 | if (cpu_has_fxsr) { |
1300 | printk(KERN_INFO "Enabling fast FPU save and restore... "); | 1302 | printk(KERN_INFO "Enabling fast FPU save and restore... "); |