diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 13:41:27 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 13:41:27 +0200 |
commit | 2fb5e1e101d1b1c9a1aeca7ad99a02b49241ba7b (patch) | |
tree | 45c4575110c61ca181196c038e1579f0f4fb0174 /arch/x86/kernel/Makefile | |
parent | 34646bca474142e1424e5f6c4a33cb2ba0930ea1 (diff) | |
parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
download | linux-2fb5e1e101d1b1c9a1aeca7ad99a02b49241ba7b.tar.gz linux-2fb5e1e101d1b1c9a1aeca7ad99a02b49241ba7b.tar.bz2 linux-2fb5e1e101d1b1c9a1aeca7ad99a02b49241ba7b.zip |
Merge branch 'linus' into x86/paravirt-spinlocks
Conflicts:
arch/x86/kernel/Makefile
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/Makefile')
-rw-r--r-- | arch/x86/kernel/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index 78d52171400b..058c5594f493 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile @@ -8,8 +8,7 @@ CPPFLAGS_vmlinux.lds += -U$(UTS_MACHINE) ifdef CONFIG_FTRACE # Do not profile debug and lowlevel utilities -CFLAGS_REMOVE_tsc_64.o = -pg -CFLAGS_REMOVE_tsc_32.o = -pg +CFLAGS_REMOVE_tsc.o = -pg CFLAGS_REMOVE_rtc.o = -pg CFLAGS_REMOVE_paravirt.o = -pg endif |