1 files changed, 21 insertions, 12 deletions

diff --git a/arch/microblaze/kernel/exceptions.c b/arch/microblaze/kernel/exceptions.c
index 0cb64a31e89a..d9f70f83097f 100644
--- a/arch/microblaze/kernel/exceptions.c
+++ b/arch/microblaze/kernel/exceptions.c
@@ -72,7 +72,8 @@ asmlinkage void full_exception(struct pt_regs *regs, unsigned int type,
 #endif
 
 #if 0
-        printk(KERN_WARNING "Exception %02x in %s mode, FSR=%08x PC=%08x ESR=%08x\n",
+        printk(KERN_WARNING "Exception %02x in %s mode, FSR=%08x PC=%08x " \
+                                                        "ESR=%08x\n",
                         type, user_mode(regs) ? "user" : "kernel", fsr,
                         (unsigned int) regs->pc, (unsigned int) regs->esr);
 #endif
@@ -80,42 +81,50 @@ asmlinkage void full_exception(struct pt_regs *regs, unsigned int type,
         switch (type & 0x1F) {
         case MICROBLAZE_ILL_OPCODE_EXCEPTION:
                 if (user_mode(regs)) {
-                        printk(KERN_WARNING "Illegal opcode exception in user mode.\n");
+                        pr_debug(KERN_WARNING "Illegal opcode exception " \
+                                                        "in user mode.\n");
                         _exception(SIGILL, regs, ILL_ILLOPC, addr);
                         return;
                 }
-                printk(KERN_WARNING "Illegal opcode exception in kernel mode.\n");
+                printk(KERN_WARNING "Illegal opcode exception " \
+                                                        "in kernel mode.\n");
                 die("opcode exception", regs, SIGBUS);
                 break;
         case MICROBLAZE_IBUS_EXCEPTION:
                 if (user_mode(regs)) {
-                        printk(KERN_WARNING "Instruction bus error exception in user mode.\n");
+                        pr_debug(KERN_WARNING "Instruction bus error " \
+                                                "exception in user mode.\n");
                         _exception(SIGBUS, regs, BUS_ADRERR, addr);
                         return;
                 }
-                printk(KERN_WARNING "Instruction bus error exception in kernel mode.\n");
+                printk(KERN_WARNING "Instruction bus error exception " \
+                                                        "in kernel mode.\n");
                 die("bus exception", regs, SIGBUS);
                 break;
         case MICROBLAZE_DBUS_EXCEPTION:
                 if (user_mode(regs)) {
-                        printk(KERN_WARNING "Data bus error exception in user mode.\n");
+                        pr_debug(KERN_WARNING "Data bus error exception " \
+                                                        "in user mode.\n");
                         _exception(SIGBUS, regs, BUS_ADRERR, addr);
                         return;
                 }
-                printk(KERN_WARNING "Data bus error exception in kernel mode.\n");
+                printk(KERN_WARNING "Data bus error exception " \
+                                                        "in kernel mode.\n");
                 die("bus exception", regs, SIGBUS);
                 break;
         case MICROBLAZE_DIV_ZERO_EXCEPTION:
                 if (user_mode(regs)) {
-                        printk(KERN_WARNING "Divide by zero exception in user mode\n");
-                        _exception(SIGILL, regs, ILL_ILLOPC, addr);
+                        pr_debug(KERN_WARNING "Divide by zero exception " \
+                                                        "in user mode\n");
+                        _exception(SIGILL, regs, FPE_INTDIV, addr);
                         return;
                 }
-                printk(KERN_WARNING "Divide by zero exception in kernel mode.\n");
+                printk(KERN_WARNING "Divide by zero exception " \
+                                                        "in kernel mode.\n");
                 die("Divide by exception", regs, SIGBUS);
                 break;
         case MICROBLAZE_FPU_EXCEPTION:
-                printk(KERN_WARNING "FPU exception\n");
+                pr_debug(KERN_WARNING "FPU exception\n");
                 /* IEEE FP exception */
                 /* I removed fsr variable and use code var for storing fsr */
                 if (fsr & FSR_IO)
@@ -133,7 +142,7 @@ asmlinkage void full_exception(struct pt_regs *regs, unsigned int type,
 
 #ifdef CONFIG_MMU
         case MICROBLAZE_PRIVILEGED_EXCEPTION:
-                printk(KERN_WARNING "Privileged exception\n");
+                pr_debug(KERN_WARNING "Privileged exception\n");
                 /* "brk r0,r0" - used as debug breakpoint */
                 if (get_user(code, (unsigned long *)regs->pc) == 0
                         && code == 0x980c0000) {