---

yaml --- r: 227233 b: refs/heads/master c: 371db06 h: refs/heads/master i: 227231: b798586 v: v3
git-mirror · Jan 5, 2011 · d7d6505 · d7d6505
1 parent 682d967
commit d7d6505
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b9599798f953084774da926caa8bafd7e244948e
+refs/heads/master: 371db06b017c518da2d69ae278c5978ebcd1041a
diff --git a/trunk/arch/s390/include/asm/kprobes.h b/trunk/arch/s390/include/asm/kprobes.h
@@ -31,7 +31,6 @@
 #include <linux/ptrace.h>
 #include <linux/percpu.h>
 
-#define  __ARCH_WANT_KPROBES_INSN_SLOT
 struct pt_regs;
 struct kprobe;
 
@@ -58,7 +57,7 @@ typedef u16 kprobe_opcode_t;
 /* Architecture specific copy of original instruction */
 struct arch_specific_insn {
 	/* copy of original instruction */
-	kprobe_opcode_t *insn;
+	kprobe_opcode_t insn[MAX_INSN_SIZE];
 };
 
 struct prev_kprobe {

diff --git a/trunk/arch/s390/kernel/kprobes.c b/trunk/arch/s390/kernel/kprobes.c
@@ -126,10 +126,6 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p)
 	if (is_prohibited_opcode((kprobe_opcode_t *) p->addr))
 		return -EINVAL;
 
-	/* Use the get_insn_slot() facility for correctness */
-	if (!(p->ainsn.insn = get_insn_slot()))
-		return -ENOMEM;
-
 	p->opcode = *p->addr;
 	memcpy(p->ainsn.insn, p->addr, ((p->opcode >> 14) + 3) & -2);
 
@@ -173,10 +169,6 @@ void __kprobes arch_disarm_kprobe(struct kprobe *p)
 
 void __kprobes arch_remove_kprobe(struct kprobe *p)
 {
-	if (p->ainsn.insn) {
-		free_insn_slot(p->ainsn.insn, 0);
-		p->ainsn.insn = NULL;
-	}
 }
 
 static void __kprobes enable_singlestep(struct kprobe_ctlblk *kcb,