diff options
author | Brian Gerst <brgerst@gmail.com> | 2010-03-21 09:00:44 -0400 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2010-05-03 13:39:29 -0700 |
commit | 9b6dba9e0798325dab427b9d60c61630ccc39b28 (patch) | |
tree | 1c77070ab65422cf051ad05e50b70bdeb4acbce9 /arch/x86/kernel/irqinit.c | |
parent | 40d2e76315da38993129090dc5d56377e573c312 (diff) | |
download | linux-stable-9b6dba9e0798325dab427b9d60c61630ccc39b28.tar.gz linux-stable-9b6dba9e0798325dab427b9d60c61630ccc39b28.tar.bz2 linux-stable-9b6dba9e0798325dab427b9d60c61630ccc39b28.zip |
x86: Merge simd_math_error() into math_error()
The only difference between FPU and SIMD exceptions is where the
status bits are read from (cwd/swd vs. mxcsr). This also fixes
the discrepency introduced by commit adf77bac, which fixed FPU
but not SIMD.
Signed-off-by: Brian Gerst <brgerst@gmail.com>
LKML-Reference: <1269176446-2489-3-git-send-email-brgerst@gmail.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/kernel/irqinit.c')
-rw-r--r-- | arch/x86/kernel/irqinit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/irqinit.c b/arch/x86/kernel/irqinit.c index 0ed2d300cd46..990ae7cfc578 100644 --- a/arch/x86/kernel/irqinit.c +++ b/arch/x86/kernel/irqinit.c @@ -60,7 +60,7 @@ static irqreturn_t math_error_irq(int cpl, void *dev_id) outb(0, 0xF0); if (ignore_fpu_irq || !boot_cpu_data.hard_math) return IRQ_NONE; - math_error((void __user *)get_irq_regs()->ip); + math_error(get_irq_regs(), 0, 16); return IRQ_HANDLED; } |