diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-19 16:02:23 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-19 16:02:23 -0500 |
| commit | 1bd12c91de35756129b8ffe28a4fe45177b86381 (patch) | |
| tree | 4217aef46c19c963b44b202382beeddd3063fa5a /arch/x86/kernel/traps.c | |
| parent | 3dbff0d5e8ec9e6d0834ea889d496bc724743dfd (diff) | |
| parent | bc3eba60682750dd7b45ea616d65c926fc3b8be8 (diff) | |
Merge branch 'x86/nuke386' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull one final 386 removal patch from Peter Anvin.
IRQ 13 FPU error handling is gone. That was not one of the proudest
moments in PC history.
* 'x86/nuke386' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, 386 removal: Remove support for IRQ 13 FPU error reporting
Diffstat (limited to 'arch/x86/kernel/traps.c')
| -rw-r--r-- | arch/x86/kernel/traps.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c index eb8586693e0b..ecffca11f4e9 100644 --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c | |||
| @@ -69,9 +69,6 @@ | |||
| 69 | 69 | ||
| 70 | asmlinkage int system_call(void); | 70 | asmlinkage int system_call(void); |
| 71 | 71 | ||
| 72 | /* Do we ignore FPU interrupts ? */ | ||
| 73 | char ignore_fpu_irq; | ||
| 74 | |||
| 75 | /* | 72 | /* |
| 76 | * The IDT has to be page-aligned to simplify the Pentium | 73 | * The IDT has to be page-aligned to simplify the Pentium |
| 77 | * F0 0F bug workaround. | 74 | * F0 0F bug workaround. |
| @@ -564,9 +561,6 @@ void math_error(struct pt_regs *regs, int error_code, int trapnr) | |||
| 564 | 561 | ||
| 565 | dotraplinkage void do_coprocessor_error(struct pt_regs *regs, long error_code) | 562 | dotraplinkage void do_coprocessor_error(struct pt_regs *regs, long error_code) |
| 566 | { | 563 | { |
| 567 | #ifdef CONFIG_X86_32 | ||
| 568 | ignore_fpu_irq = 1; | ||
| 569 | #endif | ||
| 570 | exception_enter(regs); | 564 | exception_enter(regs); |
| 571 | math_error(regs, error_code, X86_TRAP_MF); | 565 | math_error(regs, error_code, X86_TRAP_MF); |
| 572 | exception_exit(regs); | 566 | exception_exit(regs); |