[REFACTOR] remove field 'disarm' from 'srtuct kretprobe'

diff --git a/kprobe/dbi_kprobes.c b/kprobe/dbi_kprobes.c
index fab4f28..16183c1 100644 (file)
--- a/kprobe/dbi_kprobes.c
+++ b/kprobe/dbi_kprobes.c
@@ -611,8 +611,8 @@ int pre_handler_kretprobe(struct kprobe *p, struct pt_regs *regs)
 
        /*TODO: consider to only swap the RA after the last pre_handler fired */
        spin_lock_irqsave(&kretprobe_lock, flags);
-       if (!rp->disarm)
-               arch_prepare_kretprobe(rp, regs);
+
+       arch_prepare_kretprobe(rp, regs);
 
        spin_unlock_irqrestore(&kretprobe_lock, flags);
        DBPRINTF ("END\n");
@@ -671,8 +671,6 @@ int dbi_register_kretprobe(struct kretprobe *rp)
        rp->kp.fault_handler = NULL;
        rp->kp.break_handler = NULL;
 
-       rp->disarm = 0;
-
        /* Pre-allocate memory for max kretprobe instances */
        if ((unsigned long)rp->kp.addr == sched_addr) {
                rp->maxactive = SCHED_RP_NR;//max (100, 2 * NR_CPUS);

diff --git a/kprobe/dbi_kprobes.h b/kprobe/dbi_kprobes.h
index d193ede..bfd4340 100644 (file)
--- a/kprobe/dbi_kprobes.h
+++ b/kprobe/dbi_kprobes.h
@@ -190,7 +190,6 @@ struct kretprobe
        void *priv_arg;
        int maxactive;
        int nmissed;
-       int disarm;
        size_t data_size;
        struct hlist_head free_instances;
        struct hlist_head used_instances;