---

yaml --- r: 2943 b: refs/heads/master c: ea32c65 h: refs/heads/master i: 2941: 63148bd 2939: 2494536 2935: 11a3b0c 2927: 940c71e 2911: 8c395b8 2879: 5c17fc2 2815: 17249d3 v: v3
git-mirror · Jun 23, 2005 · 08c1478 · 08c1478
1 parent 7cf5f68
commit 08c1478
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 89cb14c0dd0e4a7d0315d19f449389c4d49237ee
+refs/heads/master: ea32c65cc2d2294c04e9f81d0578a6f51febfdbf
diff --git a/trunk/include/linux/kprobes.h b/trunk/include/linux/kprobes.h
@@ -36,6 +36,12 @@
 
 #include <asm/kprobes.h>
 
+/* kprobe_status settings */
+#define KPROBE_HIT_ACTIVE	0x00000001
+#define KPROBE_HIT_SS		0x00000002
+#define KPROBE_REENTER		0x00000004
+#define KPROBE_HIT_SSDONE	0x00000008
+
 struct kprobe;
 struct pt_regs;
 struct kretprobe;
@@ -55,6 +61,9 @@ struct kprobe {
 	/* list of kprobes for multi-handler support */
 	struct list_head list;
 
+	/*count the number of times this probe was temporarily disarmed */
+	unsigned long nmissed;
+
 	/* location of the probe point */
 	kprobe_opcode_t *addr;
 

diff --git a/trunk/kernel/kprobes.c b/trunk/kernel/kprobes.c
@@ -335,6 +335,7 @@ int register_kprobe(struct kprobe *p)
 	}
 	spin_lock_irqsave(&kprobe_lock, flags);
 	old_p = get_kprobe(p->addr);
+	p->nmissed = 0;
 	if (old_p) {
 		ret = register_aggr_kprobe(old_p, p);
 		goto out;