Merge branch 'next' into for-linus

[mv-sheeva.git] / include / linux / ftrace_event.h

diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h
index 47e3997f7b5cf39233283ff43d84937daa502c2f..22b32af1b5ec3d1aa81ddebbc2de1ace29c17cc6 100644 (file)
--- a/include/linux/ftrace_event.h
+++ b/include/linux/ftrace_event.h
@@ -37,7 +37,6 @@ struct trace_entry {
        unsigned char           flags;
        unsigned char           preempt_count;
        int                     pid;
-       int                     lock_depth;
 };
 
 #define FTRACE_MAX_EVENT                                               \
@@ -208,7 +207,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);