diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-22 09:08:14 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-22 09:08:14 +0200 |
| commit | debfcaf93ed500a051489db6646d71f29fe86a68 (patch) | |
| tree | 7ba189b6dd654022ecc655b68e3c0a4573627706 /arch/x86/kernel/Makefile | |
| parent | binfmt_elf_fdpic: Update for cputime changes. (diff) | |
| parent | ftrace: stack tracer only record when on stack (diff) | |
| download | linux-debfcaf93ed500a051489db6646d71f29fe86a68.tar.xz linux-debfcaf93ed500a051489db6646d71f29fe86a68.zip | |
Merge branch 'tracing/ftrace' into tracing/urgent
Diffstat (limited to 'arch/x86/kernel/Makefile')
| -rw-r--r-- | arch/x86/kernel/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index d7e5a58ee22f..f1283fe60723 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile @@ -6,7 +6,7 @@ extra-y := head_$(BITS).o head$(BITS).o head.o init_task.o vmlinu CPPFLAGS_vmlinux.lds += -U$(UTS_MACHINE) -ifdef CONFIG_FTRACE +ifdef CONFIG_FUNCTION_TRACER # Do not profile debug and lowlevel utilities CFLAGS_REMOVE_tsc.o = -pg CFLAGS_REMOVE_rtc.o = -pg |