From f1d92b7be8dfc4658cb8670f96bc016734bb0806 Mon Sep 17 00:00:00 2001
From: Steven Rostedt <srostedt@redhat.com>
Date: Thu, 27 Jan 2011 23:19:49 -0500
Subject: [PATCH] --- yaml --- r: 234488 b: refs/heads/master c:
 4a3d27e98a7f2682e96d6f863752e0424b00d691 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/include/linux/ftrace_event.h | 1 -
 trunk/kernel/trace/trace.h         | 2 ++
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 646e35017ca4..b326f65cf49c 100644
--- 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
index 47e3997f7b5c..1a99e7939c2b 100644
--- 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
index d754330934bb..fbff872f8db1 100644
--- 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;