---

yaml --- r: 140599 b: refs/heads/master c: 723cbe0 h: refs/heads/master i: 140597: c8e14c9 140595: 6e3415b 140591: bf0e174 v: v3
git-mirror · Jan 6, 2009 · 5b1a573 · 5b1a573
1 parent 8e612cb
commit 5b1a573
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 337 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f09eac9034a4502cce558b0ec4bf7d422b8b355b
+refs/heads/master: 723cbe0775514853c22dc45005af59c360916af1
diff --git a/trunk/kernel/trace/Kconfig b/trunk/kernel/trace/Kconfig
@@ -267,8 +267,6 @@ config HW_BRANCH_TRACER
 config KMEMTRACE
 	bool "Trace SLAB allocations"
 	select TRACING
-	select MARKERS
-	select RELAY
 	help
 	  kmemtrace provides tracing for slab allocator functions, such as
 	  kmalloc, kfree, kmem_cache_alloc, kmem_cache_free etc.. Collected

diff --git a/trunk/mm/Makefile b/trunk/mm/Makefile
@@ -35,4 +35,3 @@ obj-$(CONFIG_MIGRATION) += migrate.o
 obj-$(CONFIG_SMP) += allocpercpu.o
 obj-$(CONFIG_QUICKLIST) += quicklist.o
 obj-$(CONFIG_CGROUP_MEM_RES_CTLR) += memcontrol.o page_cgroup.o
-obj-$(CONFIG_KMEMTRACE) += kmemtrace.o
diff --git a/trunk/mm/kmemtrace.c b/trunk/mm/kmemtrace.c