From 42067bcfc1e10b96b20a40b1308a3651710bc333 Mon Sep 17 00:00:00 2001
From: Michal Simek <monstr@monstr.eu>
Date: Tue, 10 Aug 2010 08:19:03 +0200
Subject: [PATCH] --- yaml --- r: 217120 b: refs/heads/master c:
 f859f0a235d4d9e7eae49bf10bab6b0967d328f6 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index e50b28fe9ce3..8b08670cf991 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4bdfd9ebc3bb6e111309b711a601bce7a8ae6857
+refs/heads/master: f859f0a235d4d9e7eae49bf10bab6b0967d328f6
diff --git a/trunk/arch/microblaze/kernel/kgdb.c b/trunk/arch/microblaze/kernel/kgdb.c
index bfc006b7f2d8..9b5a817605ec 100644
--- a/trunk/arch/microblaze/kernel/kgdb.c
+++ b/trunk/arch/microblaze/kernel/kgdb.c
@@ -80,7 +80,7 @@ void gdb_regs_to_pt_regs(unsigned long *gdb_regs, struct pt_regs *regs)
 void microblaze_kgdb_break(struct pt_regs *regs)
 {
 	if (kgdb_handle_exception(1, SIGTRAP, 0, regs) != 0)
-		return 0;
+		return;
 
 	/* Jump over the first arch_kgdb_breakpoint which is barrier to
 	 * get kgdb work. The same solution is used for powerpc */
@@ -114,7 +114,6 @@ int kgdb_arch_handle_exception(int vector, int signo, int err_code,
 {
 	char *ptr;
 	unsigned long address;
-	int cpu = smp_processor_id();
 
 	switch (remcom_in_buffer[0]) {
 	case 'c':