Merge branches 'tracing/ftrace', 'tracing/ring-buffer' and 'tracing/urgent' into...

Conflicts:
	include/linux/ftrace.h

diff --cc include/linux/ftrace.h
index 6b0db53,44020f3,9c5bc6b..04b52e6
--- 1/include/linux/ftrace.h
--- 2/include/linux/ftrace.h
--- 3/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@@@ -6,9 -6,9 -6,8 +6,10 @@@@
   #include <linux/ktime.h>
   #include <linux/init.h>
   #include <linux/types.h>
++ #include <linux/module.h>
   #include <linux/kallsyms.h>
  +#include <linux/bitops.h>
  +#include <linux/sched.h>
   
   #ifdef CONFIG_FUNCTION_TRACER
   
@@@@ -82,21 -82,13 -42,9 +83,21 @@@@ extern void ftrace_stub(unsigned long a
   # define unregister_ftrace_function(ops) do { } while (0)
   # define clear_ftrace_function(ops) do { } while (0)
   static inline void ftrace_kill(void) { }
  +static inline void ftrace_stop(void) { }
  +static inline void ftrace_start(void) { }
   #endif /* CONFIG_FUNCTION_TRACER */
   
 ++#ifdef CONFIG_STACK_TRACER
 ++extern int stack_tracer_enabled;
 ++int
 ++stack_trace_sysctl(struct ctl_table *table, int write,
 ++                struct file *file, void __user *buffer, size_t *lenp,
 ++                loff_t *ppos);
 ++#endif
 ++
   #ifdef CONFIG_DYNAMIC_FTRACE
  +/* asm/ftrace.h must be defined for archs supporting dynamic ftrace */
  +#include <asm/ftrace.h>
   
   enum {
        FTRACE_FL_FREE          = (1 << 0),

diff --cc kernel/fork.c
Simple merge

diff --cc kernel/sched.c
Simple merge

diff --cc kernel/trace/trace.c
Simple merge