Merge branches 'tracing/ftrace', 'tracing/markers', 'tracing/mmiotrace', 'tracing/nmisafe', 'tracing/tracepoints' and 'tracing/urgent' into tracing/core

2008-11-03 10:34:23 +01:00
parent d9e540762f 5d9881ea14 fd3fdf11d3 a26a2a2739 127cafbb27 c2c8052946
commit 7a895f53cd
17 changed files with 405 additions and 181 deletions
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -74,6 +74,9 @@ extern void ftrace_caller(void);
 extern void ftrace_call(void);
 extern void mcount_call(void);

+/* May be defined in arch */
+extern int ftrace_arch_read_dyn_info(char *buf, int size);
+
 /**
 * ftrace_modify_code - modify code segment
 * @ip: the address of the code segment