From e6ed054cb2027d5fb4add159d74e8e31df40288b Mon Sep 17 00:00:00 2001
From: Masami Hiramatsu <mhiramat@redhat.com>
Date: Tue, 9 Mar 2010 10:22:19 -0500
Subject: [PATCH] --- yaml --- r: 188274 b: refs/heads/master c:
 83ff56f46a8532488ee364bb93a9cb2a59490d33 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index d2b5f0221549..fac180293aad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a12b51c478899fe0b7e874a559b05ba35f1128ee
+refs/heads/master: 83ff56f46a8532488ee364bb93a9cb2a59490d33
diff --git a/trunk/kernel/kprobes.c b/trunk/kernel/kprobes.c
index fa034d29cf73..0ed46f3e51e9 100644
--- a/trunk/kernel/kprobes.c
+++ b/trunk/kernel/kprobes.c
@@ -259,7 +259,8 @@ static void __kprobes __free_insn_slot(struct kprobe_insn_cache *c,
 	struct kprobe_insn_page *kip;
 
 	list_for_each_entry(kip, &c->pages, list) {
-		long idx = ((long)slot - (long)kip->insns) / c->insn_size;
+		long idx = ((long)slot - (long)kip->insns) /
+				(c->insn_size * sizeof(kprobe_opcode_t));
 		if (idx >= 0 && idx < slots_per_page(c)) {
 			WARN_ON(kip->slot_used[idx] != SLOT_USED);
 			if (dirty) {