Merge branch 'siginfo-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebieder...

[linux-2.6-block.git] / arch / s390 / kernel / traps.c

diff --git a/arch/s390/kernel/traps.c b/arch/s390/kernel/traps.c
index ac44dbfc4a7e6e26817b62b442e358e9a55b1de6..164c0282b41ae62df2498b8082d6cabf9f40d975 100644 (file)
--- a/arch/s390/kernel/traps.c
+++ b/arch/s390/kernel/traps.c
@@ -229,17 +229,11 @@ void vector_exception(struct pt_regs *regs)
 
 void data_exception(struct pt_regs *regs)
 {
-       int signal = 0;
-
        save_fpu_regs();
        if (current->thread.fpu.fpc & FPC_DXC_MASK)
-               signal = SIGFPE;
-       else
-               signal = SIGILL;
-       if (signal == SIGFPE)
                do_fp_trap(regs, current->thread.fpu.fpc);
-       else if (signal)
-               do_trap(regs, signal, ILL_ILLOPN, "data exception");
+       else
+               do_trap(regs, SIGILL, ILL_ILLOPN, "data exception");
 }
 
 void space_switch_exception(struct pt_regs *regs)