summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/traps.h
diff options
context:
space:
mode:
authorBrian Gerst <brgerst@gmail.com>2010-03-21 16:00:44 +0300
committerH. Peter Anvin <hpa@zytor.com>2010-05-04 00:39:29 +0400
commit9b6dba9e0798325dab427b9d60c61630ccc39b28 (patch)
tree1c77070ab65422cf051ad05e50b70bdeb4acbce9 /arch/x86/include/asm/traps.h
parent40d2e76315da38993129090dc5d56377e573c312 (diff)
downloadlinux-9b6dba9e0798325dab427b9d60c61630ccc39b28.tar.xz
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/include/asm/traps.h')
-rw-r--r--arch/x86/include/asm/traps.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/traps.h b/arch/x86/include/asm/traps.h
index 4da91ad69e0d..f66cda56781d 100644
--- a/arch/x86/include/asm/traps.h
+++ b/arch/x86/include/asm/traps.h
@@ -79,7 +79,7 @@ static inline int get_si_code(unsigned long condition)
extern int panic_on_unrecovered_nmi;
-void math_error(void __user *);
+void math_error(struct pt_regs *, int, int);
void math_emulate(struct math_emu_info *);
#ifndef CONFIG_X86_32
asmlinkage void smp_thermal_interrupt(void);