Merge branch 'master' into devel

[safe/jmp/linux-2.6] / arch / microblaze / kernel / exceptions.c

diff --git a/arch/microblaze/kernel/exceptions.c b/arch/microblaze/kernel/exceptions.c
index e64a5c7..02cbdfe 100644 (file)
--- a/arch/microblaze/kernel/exceptions.c
+++ b/arch/microblaze/kernel/exceptions.c
@@ -116,12 +116,12 @@ asmlinkage void full_exception(struct pt_regs *regs, unsigned int type,
                if (user_mode(regs)) {
                        pr_debug(KERN_WARNING "Divide by zero exception " \
                                                        "in user mode\n");
-                       _exception(SIGILL, regs, ILL_ILLOPC, addr);
+                       _exception(SIGILL, regs, FPE_INTDIV, addr);
                        return;
                }
                printk(KERN_WARNING "Divide by zero exception " \
                                                        "in kernel mode.\n");
-               die("Divide by exception", regs, SIGBUS);
+               die("Divide by zero exception", regs, SIGBUS);
                break;
        case MICROBLAZE_FPU_EXCEPTION:
                pr_debug(KERN_WARNING "FPU exception\n");