diff options
author | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
---|---|---|
committer | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
commit | 8dea78da5cee153b8af9c07a2745f6c55057fe12 (patch) | |
tree | a8f4d49d63b1ecc92f2fddceba0655b2472c5bd9 /arch/x86/math-emu | |
parent | 406089d01562f1e2bf9f089fd7637009ebaad589 (diff) |
Patched in Tegra support.
Diffstat (limited to 'arch/x86/math-emu')
-rw-r--r-- | arch/x86/math-emu/fpu_entry.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/math-emu/fpu_entry.c b/arch/x86/math-emu/fpu_entry.c index 9b868124128..7718541541d 100644 --- a/arch/x86/math-emu/fpu_entry.c +++ b/arch/x86/math-emu/fpu_entry.c | |||
@@ -28,7 +28,6 @@ | |||
28 | #include <linux/regset.h> | 28 | #include <linux/regset.h> |
29 | 29 | ||
30 | #include <asm/uaccess.h> | 30 | #include <asm/uaccess.h> |
31 | #include <asm/traps.h> | ||
32 | #include <asm/desc.h> | 31 | #include <asm/desc.h> |
33 | #include <asm/user.h> | 32 | #include <asm/user.h> |
34 | #include <asm/i387.h> | 33 | #include <asm/i387.h> |
@@ -270,7 +269,7 @@ void math_emulate(struct math_emu_info *info) | |||
270 | FPU_EIP = FPU_ORIG_EIP; /* Point to current FPU instruction. */ | 269 | FPU_EIP = FPU_ORIG_EIP; /* Point to current FPU instruction. */ |
271 | 270 | ||
272 | RE_ENTRANT_CHECK_OFF; | 271 | RE_ENTRANT_CHECK_OFF; |
273 | current->thread.trap_nr = X86_TRAP_MF; | 272 | current->thread.trap_no = 16; |
274 | current->thread.error_code = 0; | 273 | current->thread.error_code = 0; |
275 | send_sig(SIGFPE, current, 1); | 274 | send_sig(SIGFPE, current, 1); |
276 | return; | 275 | return; |
@@ -663,7 +662,7 @@ static int valid_prefix(u_char *Byte, u_char __user **fpu_eip, | |||
663 | void math_abort(struct math_emu_info *info, unsigned int signal) | 662 | void math_abort(struct math_emu_info *info, unsigned int signal) |
664 | { | 663 | { |
665 | FPU_EIP = FPU_ORIG_EIP; | 664 | FPU_EIP = FPU_ORIG_EIP; |
666 | current->thread.trap_nr = X86_TRAP_MF; | 665 | current->thread.trap_no = 16; |
667 | current->thread.error_code = 0; | 666 | current->thread.error_code = 0; |
668 | send_sig(signal, current, 1); | 667 | send_sig(signal, current, 1); |
669 | RE_ENTRANT_CHECK_OFF; | 668 | RE_ENTRANT_CHECK_OFF; |