diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-10-30 10:26:11 +0000 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-10-30 10:26:11 +0000 |
| commit | 2231b3729eb92f163bbe64b604410ee451b2c42b (patch) | |
| tree | 4b4043cda9bfcf0912839edbb64484763853bd33 /arch/x86/kernel/Makefile | |
| parent | b99053eefce89c5c8500517f5f065c85b57d98ee (diff) | |
| parent | e946217e4fdaa67681bbabfa8e6b18641921f750 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into s3c64xx
Diffstat (limited to 'arch/x86/kernel/Makefile')
| -rw-r--r-- | arch/x86/kernel/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index d7e5a58ee22..e489ff9cb3e 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile @@ -6,11 +6,12 @@ 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 CFLAGS_REMOVE_paravirt-spinlocks.o = -pg +CFLAGS_REMOVE_ftrace.o = -pg endif # |