Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 11 insertions, 19 deletions

diff --git a/arch/microblaze/kernel/exceptions.c b/arch/microblaze/kernel/exceptions.c
index b98ee8d0c1cd..66fad2301221 100644
--- a/arch/microblaze/kernel/exceptions.c
+++ b/arch/microblaze/kernel/exceptions.c
@@ -25,6 +25,7 @@
 #include <linux/errno.h>
 #include <linux/ptrace.h>
 #include <asm/current.h>
+#include <asm/cacheflush.h>
 
 #define MICROBLAZE_ILL_OPCODE_EXCEPTION 0x02
 #define MICROBLAZE_IBUS_EXCEPTION       0x03
@@ -49,9 +50,11 @@ void die(const char *str, struct pt_regs *fp, long err)
 }
 
 /* for user application debugging */
-void sw_exception(struct pt_regs *regs)
+asmlinkage void sw_exception(struct pt_regs *regs)
 {
         _exception(SIGTRAP, regs, TRAP_BRKPT, regs->r16);
+        flush_dcache_range(regs->r16, regs->r16 + 0x4);
+        flush_icache_range(regs->r16, regs->r16 + 0x4);
 }
 
 void _exception(int signr, struct pt_regs *regs, int code, unsigned long addr)
@@ -72,7 +75,6 @@ asmlinkage void full_exception(struct pt_regs *regs, unsigned int type,
                                                         int fsr, int addr)
 {
 #ifdef CONFIG_MMU
-        int code;
         addr = regs->pc;
 #endif
 
@@ -86,8 +88,7 @@ asmlinkage void full_exception(struct pt_regs *regs, unsigned int type,
         switch (type & 0x1F) {
         case MICROBLAZE_ILL_OPCODE_EXCEPTION:
                 if (user_mode(regs)) {
-                        pr_debug(KERN_WARNING "Illegal opcode exception " \
-                                                        "in user mode.\n");
+                        pr_debug("Illegal opcode exception in user mode\n");
                         _exception(SIGILL, regs, ILL_ILLOPC, addr);
                         return;
                 }
@@ -97,8 +98,7 @@ asmlinkage void full_exception(struct pt_regs *regs, unsigned int type,
                 break;
         case MICROBLAZE_IBUS_EXCEPTION:
                 if (user_mode(regs)) {
-                        pr_debug(KERN_WARNING "Instruction bus error " \
-                                                "exception in user mode.\n");
+                        pr_debug("Instruction bus error exception in user mode\n");
                         _exception(SIGBUS, regs, BUS_ADRERR, addr);
                         return;
                 }
@@ -108,8 +108,7 @@ asmlinkage void full_exception(struct pt_regs *regs, unsigned int type,
                 break;
         case MICROBLAZE_DBUS_EXCEPTION:
                 if (user_mode(regs)) {
-                        pr_debug(KERN_WARNING "Data bus error exception " \
-                                                        "in user mode.\n");
+                        pr_debug("Data bus error exception in user mode\n");
                         _exception(SIGBUS, regs, BUS_ADRERR, addr);
                         return;
                 }
@@ -119,8 +118,7 @@ asmlinkage void full_exception(struct pt_regs *regs, unsigned int type,
                 break;
         case MICROBLAZE_DIV_ZERO_EXCEPTION:
                 if (user_mode(regs)) {
-                        pr_debug(KERN_WARNING "Divide by zero exception " \
-                                                        "in user mode\n");
+                        pr_debug("Divide by zero exception in user mode\n");
                         _exception(SIGILL, regs, FPE_INTDIV, addr);
                         return;
                 }
@@ -129,7 +127,7 @@ asmlinkage void full_exception(struct pt_regs *regs, unsigned int type,
                 die("Divide by zero exception", regs, SIGBUS);
                 break;
         case MICROBLAZE_FPU_EXCEPTION:
-                pr_debug(KERN_WARNING "FPU exception\n");
+                pr_debug("FPU exception\n");
                 /* IEEE FP exception */
                 /* I removed fsr variable and use code var for storing fsr */
                 if (fsr & FSR_IO)
@@ -147,14 +145,8 @@ asmlinkage void full_exception(struct pt_regs *regs, unsigned int type,
 
 #ifdef CONFIG_MMU
         case MICROBLAZE_PRIVILEGED_EXCEPTION:
-                pr_debug(KERN_WARNING "Privileged exception\n");
-                /* "brk r0,r0" - used as debug breakpoint - old toolchain */
-                if (get_user(code, (unsigned long *)regs->pc) == 0
-                        && code == 0x980c0000) {
-                        _exception(SIGTRAP, regs, TRAP_BRKPT, addr);
-                } else {
-                        _exception(SIGILL, regs, ILL_PRVOPC, addr);
-                }
+                pr_debug("Privileged exception\n");
+                _exception(SIGILL, regs, ILL_PRVOPC, addr);
                 break;
 #endif
         default: