diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-30 20:02:02 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-30 20:02:02 +0400 |
| commit | 06b2e9886e039c2f1b3048c47e539b80ab4155b0 (patch) | |
| tree | cdc295333e93cf407fd205b21f31a12d75b0a635 /arch/parisc/math-emu | |
| parent | 35926ff5fba8245bd1c6ac04155048f6f89232b1 (diff) | |
| parent | 210501aa570fdaa8b06e56fd1c04f31f2d3f368b (diff) | |
| download | linux-06b2e9886e039c2f1b3048c47e539b80ab4155b0.tar.xz | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
parisc: Call pagefault_disable/pagefault_enable in kmap_atomic/kunmap_atomic
parisc: Remove unnecessary macros from entry.S
parisc: LWS fixes for syscall.S
parisc: Delete unnecessary nop's in entry.S
parisc: Avoid interruption in critical region in entry.S
parisc: invoke oom-killer from page fault
parisc: clear floating point exception flag on SIGFPE signal
parisc: Use of align_frame provides stack frame.
Diffstat (limited to 'arch/parisc/math-emu')
| -rw-r--r-- | arch/parisc/math-emu/decode_exc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/parisc/math-emu/decode_exc.c b/arch/parisc/math-emu/decode_exc.c index 3ca1c6149218..27a7492ddb0d 100644 --- a/arch/parisc/math-emu/decode_exc.c +++ b/arch/parisc/math-emu/decode_exc.c @@ -342,6 +342,7 @@ decode_fpu(unsigned int Fpu_register[], unsigned int trap_counts[]) return SIGNALCODE(SIGFPE, FPE_FLTINV); case DIVISIONBYZEROEXCEPTION: update_trap_counts(Fpu_register, aflags, bflags, trap_counts); + Clear_excp_register(exception_index); return SIGNALCODE(SIGFPE, FPE_FLTDIV); case INEXACTEXCEPTION: update_trap_counts(Fpu_register, aflags, bflags, trap_counts); |