This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / kernel / kprobes.c

diff --git a/kernel/kprobes.c b/kernel/kprobes.c
index d3d1321..ca4e28b 100644 (file)
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
@@ -84,13 +84,10 @@ int register_kprobe(struct kprobe *p)
                ret = -EEXIST;
                goto out;
        }
-
-       if ((ret = arch_prepare_kprobe(p)) != 0) {
-               goto out;
-       }
        hlist_add_head(&p->hlist,
                       &kprobe_table[hash_ptr(p->addr, KPROBE_HASH_BITS)]);
 
+       arch_prepare_kprobe(p);
        p->opcode = *p->addr;
        *p->addr = BREAKPOINT_INSTRUCTION;
        flush_icache_range((unsigned long) p->addr,
@@ -104,7 +101,6 @@ void unregister_kprobe(struct kprobe *p)
 {
        unsigned long flags;
        spin_lock_irqsave(&kprobe_lock, flags);
-       arch_remove_kprobe(p);
        *p->addr = p->opcode;
        hlist_del(&p->hlist);
        flush_icache_range((unsigned long) p->addr,