---

yaml --- r: 234488 b: refs/heads/master c: 4a3d27e h: refs/heads/master v: v3
git-mirror · Feb 8, 2011 · f1d92b7 · f1d92b7
1 parent 408dad6
commit f1d92b7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43cd414552d8137157e926e46361678ea867e476
+refs/heads/master: 4a3d27e98a7f2682e96d6f863752e0424b00d691
diff --git a/trunk/include/linux/ftrace_event.h b/trunk/include/linux/ftrace_event.h
@@ -208,7 +208,6 @@ struct ftrace_event_call {
 
 #define PERF_MAX_TRACE_SIZE	2048
 
-#define MAX_FILTER_PRED		32
 #define MAX_FILTER_STR_VAL	256	/* Should handle KSYM_SYMBOL_LEN */
 
 extern void destroy_preds(struct ftrace_event_call *call);

diff --git a/trunk/kernel/trace/trace.h b/trunk/kernel/trace/trace.h
@@ -680,6 +680,8 @@ struct event_subsystem {
 #define FILTER_PRED_IS_RIGHT	(1 << 15)
 #define FILTER_PRED_FOLD	(1 << 15)
 
+#define MAX_FILTER_PRED		32
+
 struct filter_pred;
 struct regex;