---

yaml --- r: 234484 b: refs/heads/master c: 61e9dea h: refs/heads/master v: v3
git-mirror · Feb 8, 2011 · f54744a · f54744a
1 parent 2613c20
commit f54744a
Show file tree

Hide file tree

Showing 3 changed files with 195 additions and 47 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f76690afd05e3e163149310bdcd30234f93b3a7a
+refs/heads/master: 61e9dea20e1ada886cc49a9ec6fe3c6ac0de7324
diff --git a/trunk/kernel/trace/trace.h b/trunk/kernel/trace/trace.h
@@ -664,6 +664,7 @@ struct event_filter {
 	int			n_preds;	/* Number assigned */
 	int			a_preds;	/* allocated */
 	struct filter_pred	*preds;
+	struct filter_pred	*root;
 	char			*filter_string;
 };
 
@@ -675,6 +676,9 @@ struct event_subsystem {
 	int			nr_events;
 };
 
+#define FILTER_PRED_INVALID	((unsigned short)-1)
+#define FILTER_PRED_IS_RIGHT	(1 << 15)
+
 struct filter_pred;
 struct regex;
 
@@ -704,7 +708,10 @@ struct filter_pred {
 	int 			offset;
 	int 			not;
 	int 			op;
-	int 			pop_n;
+	unsigned short		index;
+	unsigned short		parent;
+	unsigned short		left;
+	unsigned short		right;
 };
 
 extern struct list_head ftrace_common_fields;