From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 11 Aug 2009 12:19:09 +0000 (+0200)
Subject: Merge branch 'linus' into tracing/core
X-Git-Tag: v2.6.33-rc1~48^2~419
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=89034bc2c7b839702c00a704e79d112737f98be0;p=platform%2Fkernel%2Flinux-3.10.git

Merge branch 'linus' into tracing/core

Conflicts:
	kernel/trace/trace_events_filter.c

We use the tracing/core version.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

89034bc2c7b839702c00a704e79d112737f98be0
diff --cc include/linux/ftrace_event.h
index 26d3673,a81170d..ac8c6f8
--- a/include/linux/ftrace_event.h
+++ b/include/linux/ftrace_event.h
@@@ -118,14 -118,12 +120,12 @@@ struct ftrace_event_call 
  	int			(*define_fields)(void);
  	struct list_head	fields;
  	int			filter_active;
 -	void			*filter;
 +	struct event_filter	*filter;
  	void			*mod;
  
- #ifdef CONFIG_EVENT_PROFILE
- 	atomic_t	profile_count;
- 	int		(*profile_enable)(struct ftrace_event_call *);
- 	void		(*profile_disable)(struct ftrace_event_call *);
- #endif
+ 	atomic_t		profile_count;
+ 	int			(*profile_enable)(struct ftrace_event_call *);
+ 	void			(*profile_disable)(struct ftrace_event_call *);
  };
  
  #define MAX_FILTER_PRED		32