From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 19 Dec 2008 08:42:40 +0000 (+0100)
Subject: Merge branches 'tracing/ftrace', 'tracing/ring-buffer' and 'tracing/urgent' into... 
X-Git-Tag: v2.6.30-rc1~2^2~209
X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=30cd324e9787ccc9a5ede59742d5409857550692

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

Conflicts:
	include/linux/ftrace.h
---

30cd324e9787ccc9a5ede59742d5409857550692
diff --cc include/linux/ftrace.h
index 6b0db53,44020f3,9c5bc6b..04b52e6
--- a/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),