From 21a31ba8b6501a867993421f7109d52582f320f6 Mon Sep 17 00:00:00 2001
From: Michal Simek <monstr@monstr.eu>
Date: Tue, 3 Aug 2010 11:32:20 +0200
Subject: [PATCH] --- yaml --- r: 217123 b: refs/heads/master c:
 0425609680927f3368b0e0270452d41759d43b3f h: refs/heads/master i:   217121:
 6f3326ad4c3ad052c1870dad581dd7e4925af87a   217119:
 da2c86d3b4b34388dc608a9aa1c0b2faba8f2d1c v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/microblaze/kernel/exceptions.c | 9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 1604f307bd61..fd7f50e62673 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 95d3a8cd1596b7d34b873d1fa5a70bbc656f5410
+refs/heads/master: 0425609680927f3368b0e0270452d41759d43b3f
diff --git a/trunk/arch/microblaze/kernel/exceptions.c b/trunk/arch/microblaze/kernel/exceptions.c
index 7dd4d127fce8..478f2943ede7 100644
--- a/trunk/arch/microblaze/kernel/exceptions.c
+++ b/trunk/arch/microblaze/kernel/exceptions.c
@@ -72,7 +72,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
 
@@ -144,13 +143,7 @@ asmlinkage void full_exception(struct pt_regs *regs, unsigned int type,
 #ifdef CONFIG_MMU
 	case MICROBLAZE_PRIVILEGED_EXCEPTION:
 		pr_debug("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);
-		}
+		_exception(SIGILL, regs, ILL_PRVOPC, addr);
 		break;
 #endif
 	default: