diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-21 10:45:56 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-21 10:45:56 -0400 |
| commit | 2e2dcc7631e331cf2e8396ce452e7f01e35f1182 (patch) | |
| tree | 5a02c9602db66bc8c8db9660899c0c4455d7464f /arch/x86/kernel/Makefile | |
| parent | acee709cab689ec7703770e8b8cb5cc3a4abcb31 (diff) | |
| parent | 1c29dd9a9e2f83ffb02e50bb3619c3b9db8fd526 (diff) | |
Merge branch 'x86/paravirt-spinlocks' into x86/for-linus
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 b78a17b12810..3db651fc8ec5 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile | |||
| @@ -7,9 +7,10 @@ extra-y := head_$(BITS).o head$(BITS).o head.o init_task.o vmlinu | |||
| 7 | CPPFLAGS_vmlinux.lds += -U$(UTS_MACHINE) | 7 | CPPFLAGS_vmlinux.lds += -U$(UTS_MACHINE) |
| 8 | 8 | ||
| 9 | ifdef CONFIG_FTRACE | 9 | ifdef CONFIG_FTRACE |
| 10 | # Do not profile debug utilities | 10 | # Do not profile debug and lowlevel utilities |
| 11 | CFLAGS_REMOVE_tsc.o = -pg | 11 | CFLAGS_REMOVE_tsc.o = -pg |
| 12 | CFLAGS_REMOVE_rtc.o = -pg | 12 | CFLAGS_REMOVE_rtc.o = -pg |
| 13 | CFLAGS_REMOVE_paravirt.o = -pg | ||
| 13 | endif | 14 | endif |
| 14 | 15 | ||
| 15 | # | 16 | # |