diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-21 09:05:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-21 09:05:47 -0700 |
| commit | bd4c3a3441144cd46d1f544046523724c5bc6e94 (patch) | |
| tree | 8b5c67249a7a163caf3f88cbcb9df5236fcc3b93 /kernel/Makefile | |
| parent | b3727c24da69971503a4ca98b3b877753c6a4393 (diff) | |
| parent | 583a22e7c154dc0a3938db522696b4bc7f098f59 (diff) | |
| download | op-kernel-dev-bd4c3a3441144cd46d1f544046523724c5bc6e94.zip op-kernel-dev-bd4c3a3441144cd46d1f544046523724c5bc6e94.tar.gz | |
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
kernel/profile.c: Switch /proc/irq/prof_cpu_mask to seq_file
tracing: Export trace_profile_buf symbols
tracing/events: use list_for_entry_continue
tracing: remove max_tracer_type_len
function-graph: use ftrace_graph_funcs directly
tracing: Remove markers
tracing: Allocate the ftrace event profile buffer dynamically
tracing: Factorize the events profile accounting
Diffstat (limited to 'kernel/Makefile')
| -rw-r--r-- | kernel/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/Makefile b/kernel/Makefile index 3d9c7e2..7c9b0a5 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -87,7 +87,6 @@ obj-$(CONFIG_RELAY) += relay.o obj-$(CONFIG_SYSCTL) += utsname_sysctl.o obj-$(CONFIG_TASK_DELAY_ACCT) += delayacct.o obj-$(CONFIG_TASKSTATS) += taskstats.o tsacct.o -obj-$(CONFIG_MARKERS) += marker.o obj-$(CONFIG_TRACEPOINTS) += tracepoint.o obj-$(CONFIG_LATENCYTOP) += latencytop.o obj-$(CONFIG_FUNCTION_TRACER) += trace/ |
