1 files changed, 6 insertions, 10 deletions

diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index 616846bcfee5..092e1f8d18dc 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -579,11 +579,13 @@ static inline int ftrace_trace_task(struct task_struct *task)
 
         return test_tsk_trace_trace(task);
 }
+extern int ftrace_is_dead(void);
 #else
 static inline int ftrace_trace_task(struct task_struct *task)
 {
         return 1;
 }
+static inline int ftrace_is_dead(void) { return 0; }
 #endif
 
 /*
@@ -761,16 +763,10 @@ struct filter_pred {
         filter_pred_fn_t        fn;
         u64                     val;
         struct regex            regex;
-        /*
-         * Leaf nodes use field_name, ops is used by AND and OR
-         * nodes. The field_name is always freed when freeing a pred.
-         * We can overload field_name for ops and have it freed
-         * as well.
-         */
-        union {
-                char            *field_name;
-                unsigned short  *ops;
-        };
+        unsigned short          *ops;
+#ifdef CONFIG_FTRACE_STARTUP_TEST
+        struct ftrace_event_field *field;
+#endif
         int                     offset;
         int                     not;
         int                     op;