---

yaml --- r: 100419 b: refs/heads/master c: bc0c38d h: refs/heads/master i: 100417: d18a784 100415: 070ab6d v: v3
git-mirror · May 23, 2008 · c201572 · c201572
1 parent 2fb9ae6
commit c201572
Show file tree

Hide file tree

Showing 6 changed files with 1,740 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 16444a8a40d4c7b4f6de34af0cae1f76a4f6c901
+refs/heads/master: bc0c38d139ec7fcd5c030aea16b008f3732e42ac
diff --git a/trunk/kernel/Makefile b/trunk/kernel/Makefile
@@ -70,6 +70,7 @@ obj-$(CONFIG_TASKSTATS) += taskstats.o tsacct.o
 obj-$(CONFIG_MARKERS) += marker.o
 obj-$(CONFIG_LATENCYTOP) += latencytop.o
 obj-$(CONFIG_FTRACE) += trace/
+obj-$(CONFIG_TRACING) += trace/
 
 ifneq ($(CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER),y)
 # According to Alan Modra <alan@linuxcare.com.au>, the -fno-omit-frame-pointer is

diff --git a/trunk/kernel/trace/Kconfig b/trunk/kernel/trace/Kconfig
@@ -3,3 +3,8 @@
 #
 config HAVE_FTRACE
 	bool
+
+config TRACING
+	bool
+	select DEBUG_FS
+
diff --git a/trunk/kernel/trace/Makefile b/trunk/kernel/trace/Makefile
@@ -1,3 +1,5 @@
 obj-$(CONFIG_FTRACE) += libftrace.o
 
+obj-$(CONFIG_TRACING) += trace.o
+
 libftrace-y := ftrace.o