diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-05-31 06:14:26 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-31 06:14:26 +0200 |
| commit | d5b732b17ca2fc74f370bdba5aae6c804fac8c35 (patch) | |
| tree | 4facc6d96116b032a3c1cb2ced9b2a3008e9216e /arch/parisc/math-emu/decode_exc.c | |
| parent | ARM: mach-shmobile: SH7372 has 6 SCIFA and 1 SCIFB ports (diff) | |
| parent | Linux 2.6.35-rc1 (diff) | |
| download | linux-d5b732b17ca2fc74f370bdba5aae6c804fac8c35.tar.xz linux-d5b732b17ca2fc74f370bdba5aae6c804fac8c35.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/parisc/math-emu/decode_exc.c')
| -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); |