From 8b09ad81cbba70e39824e84f62f003df78c22fd3 Mon Sep 17 00:00:00 2001
From: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Date: Wed, 22 May 2013 08:34:13 +0000
Subject: [PATCH] --- yaml --- r: 375946 b: refs/heads/master c:
 22047b85170280b0ca59ce4befd0fa1f71a4ec16 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/mips/kernel/kprobes.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2322c7493ebe..1f3c4e15245f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 087d990b371c59edbfc119600e2d2eda18366292
+refs/heads/master: 22047b85170280b0ca59ce4befd0fa1f71a4ec16
diff --git a/trunk/arch/mips/kernel/kprobes.c b/trunk/arch/mips/kernel/kprobes.c
index 12bc4ebdf55b..1f8187ab0997 100644
--- a/trunk/arch/mips/kernel/kprobes.c
+++ b/trunk/arch/mips/kernel/kprobes.c
@@ -207,7 +207,10 @@ void __kprobes arch_disarm_kprobe(struct kprobe *p)
 
 void __kprobes arch_remove_kprobe(struct kprobe *p)
 {
-	free_insn_slot(p->ainsn.insn, 0);
+	if (p->ainsn.insn) {
+		free_insn_slot(p->ainsn.insn, 0);
+		p->ainsn.insn = NULL;
+	}
 }
 
 static void save_previous_kprobe(struct kprobe_ctlblk *kcb)