Merge branches 'tracing/kmemtrace2' and 'tracing/ftrace' into tracing/urgent

2009-01-06 10:18:43 +01:00
parent 3e80680208 a103e2ab73
commit 99793e3dbe
13 changed files with 1410 additions and 854 deletions
--- a/kernel/trace/trace_hw_branches.c
+++ b/kernel/trace/trace_hw_branches.c
@@ -14,6 +14,7 @@
 #include <asm/ds.h>

 #include "trace.h"
+#include "trace_output.h"


 #define SIZEOF_BTS (1 << 13)